diff --git a/arch/0-dxvk-git/PKGBUILD b/arch/0-dxvk-git/PKGBUILD
index a8949cf..04dcedf 100755
--- a/arch/0-dxvk-git/PKGBUILD
+++ b/arch/0-dxvk-git/PKGBUILD
@@ -36,12 +36,13 @@ makedepends=(
   'wine'
 )
 
+_dxvk_gitsrc=
 _git_branch_dxvk=master
 _dxvk_commit=HEAD
 
 provides=('dxvk')
 options=(!strip !buildflags staticlibs)
-source=(${pkgname}::"git+https://github.com/doitsujin/dxvk.git#commit=${_dxvk_commit}")
+source=(${pkgname}::"${_dxvk_gitsrc}#commit=${_dxvk_commit}")
 sha256sums=('SKIP')
 
 ##############################
diff --git a/arch/0-wine-staging-git/PKGBUILD b/arch/0-wine-staging-git/PKGBUILD
index 19cda48..3938e1d 100755
--- a/arch/0-wine-staging-git/PKGBUILD
+++ b/arch/0-wine-staging-git/PKGBUILD
@@ -8,7 +8,7 @@ PKGDEST="${PWD}"
 enable_staging=1
 
 # Staging patchsets. Default: all patchsets. Please see Wine Staging patchinstall.sh file for individual patchset names.
-staging_patchsets=(--all) # In order to disable all patchsets, use #(--all) and add desired patchsets individually here 
+staging_patchsets=(--all) # In order to disable all patchsets, use #(--all) and add desired patchsets individually here
 
 # Enable 32-bit compilation? 1 = yes
 enable_32=1
@@ -34,6 +34,8 @@ pkgver=stg.5.15.2.r6.g663c3ba4+wine.wine.5.15.r83.g13ea90d80f
 pkgrel=1
 arch=('i686' 'x86_64')
 
+_wine_gitsrc=
+_staging_gitsrc=
 _wine_commit=HEAD
 _staging_commit=HEAD
 _git_branch_wine=master
@@ -122,7 +124,7 @@ optdepends=(
 options=('staticlibs')
 
 source=(
-  wine-git::"git://source.winehq.org/git/wine.git#commit=${_wine_commit}"
+  wine-git::"${_wine_gitsrc}#commit=${_wine_commit}"
   '30-win32-aliases.conf'
 )
 md5sums=('SKIP'
@@ -160,7 +162,7 @@ if [[ -d ${PWD}/wine-patches ]]; then
 fi
 
 if [[ enable_staging -eq 1 ]]; then
-  stagingsrc=wine-staging-git::"git://github.com/wine-staging/wine-staging.git#commit=${_staging_commit}"
+  stagingsrc=wine-staging-git::"${_staging_gitsrc}#commit=${_staging_commit}"
   source+=($stagingsrc)
 fi
 
diff --git a/arch/updatewine_arch.sh b/arch/updatewine_arch.sh
index 725419f..2214d3d 100755
--- a/arch/updatewine_arch.sh
+++ b/arch/updatewine_arch.sh
@@ -51,6 +51,10 @@ git_commithash_wine=${params[3]}
 git_branch_dxvk=${params[4]}
 git_branch_wine=${params[7]}
 
+git_source_dxvk=${params[8]}
+git_source_wine=${params[11]}
+git_source_wine-staging=${params[12]}
+
 ########################################################
 
 # Parse input arguments, filter user parameters
@@ -397,14 +401,17 @@ function build_pkg() {
     if [[ ${pkgname} == wine ]]; then
       check_gitOverride_wine
 
+      sed -i "s/\(^_wine_gitsrc=\).*/\1${git_source_wine}/" ${pkgbuild_file}
       sed -i "s/\(^_wine_commit=\).*/\1${git_commithash_wine}/" ${pkgbuild_file}
       sed -i "s/\(^_git_branch_wine=\).*/\1${git_branch_wine}/" ${pkgbuild_file}
 
       if [[ ! -v NO_STAGING ]]; then
+        sed -i "s/\(^_staging_gitsrc=\).*/\1${git_source_wine-staging}/" ${pkgbuild_file}
         sed -i "s/\(^_staging_commit=\).*/\1${git_commithash_winestaging}/" ${pkgbuild_file}
       fi
 
     elif [[ ${pkgname} == dxvk ]]; then
+      sed -i "s/\(^_dxvk_gitsrc=\).*/\1${git_source_dxvk}/" ${pkgbuild_file}
       sed -i "s/\(^_git_branch_dxvk=\).*/\1${git_branch_dxvk}/" ${pkgbuild_file}
       sed -i "s/\(^_dxvk_commit=\).*/\1${git_commithash_dxvk}/" ${pkgbuild_file}
     fi
diff --git a/debian/dxvkroot/dxvk.debdata b/debian/dxvkroot/dxvk.debdata
index 0aaf965..235e48d 100755
--- a/debian/dxvkroot/dxvk.debdata
+++ b/debian/dxvkroot/dxvk.debdata
@@ -16,7 +16,7 @@ A Vulkan-based translation layer for Direct3D 10/11 which
 allows running 3D applications on Linux using Wine.
 "
 
-pkg_giturl="https://github.com/doitsujin/dxvk"
+pkg_giturl="${git_source_dxvk}"
 pkg_homeurl="https://github.com/doitsujin/dxvk"
 pkg_gitbranch=${git_branch_dxvk}
 
diff --git a/debian/dxvkroot/dxvkbuild.sh b/debian/dxvkroot/dxvkbuild.sh
index 259c1a7..305e439 100755
--- a/debian/dxvkroot/dxvkbuild.sh
+++ b/debian/dxvkroot/dxvkbuild.sh
@@ -53,6 +53,10 @@ git_branch_dxvk=${params[3]}
 git_branch_glslang=${params[5]}
 git_branch_meson=${params[6]}
 
+git_source_dxvk=${params[8]}
+git_source_glslang=${params[9]}
+git_source_meson=${params[10]}
+
 ########################################################
 
 # Parse input arguments, filter user parameters
diff --git a/debian/dxvkroot/glslang.debdata b/debian/dxvkroot/glslang.debdata
index 9ff4d60..84727c6 100644
--- a/debian/dxvkroot/glslang.debdata
+++ b/debian/dxvkroot/glslang.debdata
@@ -13,7 +13,7 @@ pkg_longdesc="
 Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator
 "
 
-pkg_giturl="https://github.com/KhronosGroup/glslang"
+pkg_giturl="${git_source_glslang}"
 pkg_homeurl="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/"
 pkg_gitbranch=${git_branch_glslang}
 
diff --git a/debian/dxvkroot/meson.debdata b/debian/dxvkroot/meson.debdata
index 32948b3..83f3da4 100755
--- a/debian/dxvkroot/meson.debdata
+++ b/debian/dxvkroot/meson.debdata
@@ -15,7 +15,7 @@ productivity. It does this by providing a fast, simple and easy to\n\
 use interface for modern software development tools and practices.
 "
 
-pkg_giturl="https://github.com/mesonbuild/meson"
+pkg_giturl="${git_source_meson}"
 pkg_homeurl="http://mesonbuild.com"
 pkg_gitbranch=${git_branch_meson}
 
diff --git a/debian/wineroot/winebuild.sh b/debian/wineroot/winebuild.sh
index 293563f..3456f4f 100755
--- a/debian/wineroot/winebuild.sh
+++ b/debian/wineroot/winebuild.sh
@@ -316,6 +316,9 @@ done
 git_commithash_wine=${params[3]}
 git_branch_wine=${params[7]}
 
+git_source_wine=${params[11]}
+git_source_wine-staging=${params[12]}
+
 ########################################################
 
 # Parse input arguments, filter user parameters
@@ -403,8 +406,8 @@ function girl_check() {
 
 function getWine() {
 
-  local winesrc_url="git://source.winehq.org/git/wine.git"
-  local winestagingsrc_url="git://github.com/wine-staging/wine-staging.git"
+  local winesrc_url="${git_source_wine}"
+  local winestagingsrc_url="${git_source_wine-staging}"
 
   function cleanOldBuilds() {
     if [[ $(find "${BUILDROOT}" -type d -name "winebuild_*" | wc -l) -ne 0 ]]; then
diff --git a/options.conf b/options.conf
index 4b0e8bc..5e75c88 100644
--- a/options.conf
+++ b/options.conf
@@ -1,6 +1,6 @@
 ########################################################
 
-# Options for DXVK/Wine-Staging scripts dispatcher script
+# Options for DXVK/Wine-Staging scripts
 
 ########################################################
 
@@ -13,17 +13,26 @@
 # version available
 # Do NOT leave these variable empty!
 
-# Commits & branches: https://github.com/doitsujin/dxvk
+#########
+
+git_source_dxvk="git://github.com/doitsujin/dxvk.git"
+git_source_wine="git://source.winehq.org/git/wine.git"
+git_source_wine-staging="git://github.com/wine-staging/wine-staging.git"
+
+# DXVK commits & branches
 git_commithash_dxvk=HEAD
 git_branch_dxvk=master
 
-# Commits & branches: https://source.winehq.org/git/wine.git/
+# Wine commits & branches
 git_commithash_wine=HEAD
 git_branch_wine=master
 
 ##########
 # These apply only on Debian/Ubuntu/Mint
 
+git_source_meson="git://github.com/mesonbuild/meson.git"
+git_source_glslang="git://github.com/KhronosGroup/glslang.git"
+
 # Commits & branches: https://github.com/mesonbuild/meson
 git_commithash_meson=5d6dcf8850fcc5d552f55943b6aa3582754dedf8
 git_branch_meson=master
diff --git a/updatewine.sh b/updatewine.sh
index dff31eb..05d492c 100755
--- a/updatewine.sh
+++ b/updatewine.sh
@@ -179,20 +179,31 @@ datesuffix=$(echo $(date '+%Y-%m-%d-%H%M%S'))
 # Pass them to subscripts, as well.
 
 githash_overrides=(
-  "${git_commithash_dxvk}"
-  "${git_commithash_glslang}"
-  "${git_commithash_meson}"
-  "${git_commithash_wine}"
+  "${git_commithash_dxvk}"     # 0
+  "${git_commithash_glslang}"  # 1
+  "${git_commithash_meson}"    # 2
+  "${git_commithash_wine}"     # 3
 )
 
 # Add git branches to argument list
 # Pass them to subscripts, as well.
 
 gitbranch_overrides=(
-  "${git_branch_dxvk}"
-  "${git_branch_glslang}"
-  "${git_branch_meson}"
-  "${git_branch_wine}"
+  "${git_branch_dxvk}"         # 4
+  "${git_branch_glslang}"      # 5
+  "${git_branch_meson}"        # 6
+  "${git_branch_wine}"         # 7
+)
+
+# Add git sources to argument list
+# Pass them to subscripts, as well.
+
+gitsources=(
+  "${git_source_dxvk}"         # 8
+  "${git_source_glslang}"      # 9
+  "${git_source_meson}"        # 10
+  "${git_source_wine}"         # 11
+  "${git_source_wine-staging}" # 12
 )
 
 #############################
@@ -210,7 +221,7 @@ done
 
 ###########################################################
 
-params=(${datesuffix} ${githash_overrides[@]} ${gitbranch_overrides[@]} ${args[@]})
+params=(${datesuffix} ${githash_overrides[@]} ${gitbranch_overrides[@]} ${gitsources[@]} ${args[@]})
 
 ###########################################################