diff --git a/docker-builder-data/build/script/include/inc-pkall-none.sh b/docker-builder-data/build/script/include/inc-pkall-none.sh
index 6fd88f9..34e152c 100644
--- a/docker-builder-data/build/script/include/inc-pkall-none.sh
+++ b/docker-builder-data/build/script/include/inc-pkall-none.sh
@@ -11,7 +11,7 @@ PK_CONFIGURE_OPTIONS=
 PK_CFLAGS=
 PK_CPPFLAGS=
 PK_LDFLAGS=
-PK_GIT_OPTIONS=
+PK_GIT_CHECKOUT=
 PK_LICENSE_FILES=
 
 PK_CONFIGURE_OPTIONS_DEFAULT=
diff --git a/docker-builder-data/build/script/include/inc-pkdownload-git.sh b/docker-builder-data/build/script/include/inc-pkdownload-git.sh
index 7da6114..a382f34 100644
--- a/docker-builder-data/build/script/include/inc-pkdownload-git.sh
+++ b/docker-builder-data/build/script/include/inc-pkdownload-git.sh
@@ -7,12 +7,19 @@ pkdownload() {
     if [ -d "$DOWNLOAD_PACKET_DIR/$PK_DIRNAME/.git" ]; then
         cd "$DOWNLOAD_PACKET_DIR/$PK_DIRNAME" || return 1
         git fetch || return 1
-        git reset --hard origin/$(git rev-parse --abbrev-ref HEAD) || return 1
+        if [ "$PK_GIT_CHECKOUT" = "" ]; then
+            git reset --hard origin/$(git rev-parse --abbrev-ref HEAD) || return 1
+        else
+            git reset --hard "$PK_GIT_CHECKOUT" || return 1
+        fi
         git submodule init || true
         git submodule update || true
     else
-        git clone "$PK_URL" $PK_GIT_OPTIONS || return 1
+        git clone "$PK_URL" || return 1
         cd "$DOWNLOAD_PACKET_DIR/$PK_DIRNAME" || return 1
+        if [ ! "$PK_GIT_CHECKOUT" = "" ]; then
+            git reset --hard "$PK_GIT_CHECKOUT" || return 1
+        fi
         git submodule init || true
         git submodule update || true
     fi
diff --git a/docker-builder-data/build/script/packet/appimagekit-master.sh b/docker-builder-data/build/script/packet/appimagekit-master.sh
index 4d7774e..9ef28fe 100644
--- a/docker-builder-data/build/script/packet/appimagekit-master.sh
+++ b/docker-builder-data/build/script/packet/appimagekit-master.sh
@@ -3,7 +3,7 @@ DEPS_NATIVE="cmake-3.6.2"
 
 PK_DIRNAME="AppImageKit"
 PK_URL="https://github.com/probonopd/$PK_DIRNAME.git"
-PK_GIT_OPTIONS="--branch master"
+PK_GIT_CHECKOUT="origin/master"
 
 source $INCLUDE_SCRIPT_DIR/inc-pkall-git.sh
 
diff --git a/docker-builder-data/build/script/packet/epoxy-master.sh b/docker-builder-data/build/script/packet/epoxy-master.sh
index 1b52431..6dd7855 100644
--- a/docker-builder-data/build/script/packet/epoxy-master.sh
+++ b/docker-builder-data/build/script/packet/epoxy-master.sh
@@ -2,6 +2,7 @@ DEPS=""
 
 PK_DIRNAME="libepoxy"
 PK_URL="https://github.com/anholt/$PK_DIRNAME.git"
+PK_GIT_CHECKOUT="tags/1.4.2"
 
 source $INCLUDE_SCRIPT_DIR/inc-pkall-git.sh
 
diff --git a/docker-builder-data/build/script/packet/lz4-master.sh b/docker-builder-data/build/script/packet/lz4-master.sh
index 508527c..49050af 100644
--- a/docker-builder-data/build/script/packet/lz4-master.sh
+++ b/docker-builder-data/build/script/packet/lz4-master.sh
@@ -2,6 +2,7 @@ DEPS=""
 
 PK_DIRNAME="lz4"
 PK_URL="https://github.com/Cyan4973/$PK_DIRNAME.git"
+PK_GIT_CHECKOUT="tags/v1.7.5"
 PK_LICENSE_FILES="LICENSE lib/LICENSE programs/COPYING tests/COPYING examples/COPYING"
 
 source $INCLUDE_SCRIPT_DIR/inc-pkall-git.sh
diff --git a/docker-builder-data/build/script/packet/openblas-master.sh b/docker-builder-data/build/script/packet/openblas-master.sh
index 715bfe2..0710eb4 100644
--- a/docker-builder-data/build/script/packet/openblas-master.sh
+++ b/docker-builder-data/build/script/packet/openblas-master.sh
@@ -2,6 +2,7 @@ DEPS=""
 
 PK_DIRNAME="OpenBLAS"
 PK_URL="https://github.com/xianyi/$PK_DIRNAME.git"
+PK_GIT_CHECKOUT="tags/v0.2.19"
 PK_LICENSE_FILES="LICENSE CONTRIBUTORS.md BACKERS.md"
 
 source $INCLUDE_SCRIPT_DIR/inc-pkall-git.sh
diff --git a/docker-builder-data/build/script/packet/opentoonz-testing.sh b/docker-builder-data/build/script/packet/opentoonz-testing.sh
index 0d2371b..8f860da 100644
--- a/docker-builder-data/build/script/packet/opentoonz-testing.sh
+++ b/docker-builder-data/build/script/packet/opentoonz-testing.sh
@@ -3,6 +3,6 @@ source "$PACKET_SCRIPT_DIR/opentoonz-master.sh"
 DEPS="$DEPS mypaintlib-master"
 PK_DIRNAME="opentoonz"
 PK_URL="https://github.com/blackwarthog/$PK_DIRNAME.git"
-PK_GIT_OPTIONS="--branch testing"
+PK_GIT_CHECKOUT="origin/testing"
 
 PK_LICENSE_FILES="$PK_LICENSE_FILES stuff/library/mypaint?brushes/Licenses.txt"
diff --git a/docker-builder-data/build/script/packet/papagayong-testing.sh b/docker-builder-data/build/script/packet/papagayong-testing.sh
index 4ee6826..93a3c4b 100644
--- a/docker-builder-data/build/script/packet/papagayong-testing.sh
+++ b/docker-builder-data/build/script/packet/papagayong-testing.sh
@@ -1,3 +1,3 @@
 source "$PACKET_SCRIPT_DIR/papagayong-master.sh"
 
-PK_GIT_OPTIONS="--branch testing"
+PK_GIT_CHECKOUT="origin/testing"
diff --git a/docker-builder-data/build/script/packet/python3pyaudio-master.sh b/docker-builder-data/build/script/packet/python3pyaudio-master.sh
index 820dcc4..64d6c6d 100644
--- a/docker-builder-data/build/script/packet/python3pyaudio-master.sh
+++ b/docker-builder-data/build/script/packet/python3pyaudio-master.sh
@@ -2,6 +2,7 @@ DEPS="python-3.6.0 portaudio-19.6.0"
 
 PK_DIRNAME="pyaudio"
 PK_URL="https://people.csail.mit.edu/hubert/git/$PK_DIRNAME.git"
+PK_GIT_CHECKOUT="tags/v0.2.11"
 PK_LICENSE_FILES="README"
 
 source $INCLUDE_SCRIPT_DIR/inc-pkall-git.sh
diff --git a/docker-builder-data/build/script/packet/python3requests-master.sh b/docker-builder-data/build/script/packet/python3requests-master.sh
index 63f5fdd..9771338 100644
--- a/docker-builder-data/build/script/packet/python3requests-master.sh
+++ b/docker-builder-data/build/script/packet/python3requests-master.sh
@@ -2,6 +2,7 @@ DEPS="python-3.6.0"
 
 PK_DIRNAME="requests"
 PK_URL="https://github.com/kennethreitz/$PK_DIRNAME.git"
+PK_GIT_CHECKOUT="tags/v2.17.3"
 PK_LICENSE_FILES="AUTHORS.rst LICENSE"
 
 source $INCLUDE_SCRIPT_DIR/inc-pkall-git.sh
diff --git a/docker-builder-data/build/script/packet/synfigcore-debug.sh b/docker-builder-data/build/script/packet/synfigcore-debug.sh
index c1e76c9..36632f8 100644
--- a/docker-builder-data/build/script/packet/synfigcore-debug.sh
+++ b/docker-builder-data/build/script/packet/synfigcore-debug.sh
@@ -2,6 +2,6 @@ source "$PACKET_SCRIPT_DIR/synfigcore-master.sh"
 
 DEPS=`echo "$DEPS" | sed "s|synfigetl-master|synfigetl-debug|g"`
 PK_URL="https://github.com/blackwarthog/$PK_DIRNAME.git"
-PK_GIT_OPTIONS="--branch debug"
+PK_GIT_CHECKOUT="origin/debug"
 PK_CPPFLAGS="-Wa,-mbig-obj"
 PK_CONFIGURE_OPTIONS="--enable-debug --enable-optimization=0"
diff --git a/docker-builder-data/build/script/packet/synfigcore-master.sh b/docker-builder-data/build/script/packet/synfigcore-master.sh
index 811e909..411d716 100644
--- a/docker-builder-data/build/script/packet/synfigcore-master.sh
+++ b/docker-builder-data/build/script/packet/synfigcore-master.sh
@@ -77,7 +77,7 @@ fi
 
 PK_DIRNAME="synfig"
 PK_URL="https://github.com/synfig/$PK_DIRNAME.git"
-PK_GIT_OPTIONS="--branch testing"
+PK_GIT_CHECKOUT="origin/testing"
 PK_LICENSE_FILES="synfig-core/AUTHORS synfig-core/README"
 
 source $INCLUDE_SCRIPT_DIR/inc-pkall-git.sh
diff --git a/docker-builder-data/build/script/packet/synfigetl-debug.sh b/docker-builder-data/build/script/packet/synfigetl-debug.sh
index 84bf2c0..2245a5d 100644
--- a/docker-builder-data/build/script/packet/synfigetl-debug.sh
+++ b/docker-builder-data/build/script/packet/synfigetl-debug.sh
@@ -1,5 +1,5 @@
 source "$PACKET_SCRIPT_DIR/synfigetl-master.sh"
 
 PK_URL="https://github.com/blackwarthog/$PK_DIRNAME.git"
-PK_GIT_OPTIONS="--branch debug"
+PK_GIT_CHECKOUT="origin/debug"
 PK_CONFIGURE_OPTIONS="--enable-debug --enable-optimization=0"
diff --git a/docker-builder-data/build/script/packet/synfigetl-master.sh b/docker-builder-data/build/script/packet/synfigetl-master.sh
index b67ac99..46678dd 100644
--- a/docker-builder-data/build/script/packet/synfigetl-master.sh
+++ b/docker-builder-data/build/script/packet/synfigetl-master.sh
@@ -3,7 +3,7 @@ DEPS_NATIVE="libtool-2.4.6"
 
 PK_DIRNAME="synfig"
 PK_URL="https://github.com/synfig/$PK_DIRNAME.git"
-PK_GIT_OPTIONS="--branch testing"
+PK_GIT_CHECKOUT="origin/testing"
 PK_LICENSE_FILES="ETL/AUTHORS ETL/README"
 
 source $INCLUDE_SCRIPT_DIR/inc-pkall-git.sh
diff --git a/docker-builder-data/build/script/packet/synfigstudio-debug.sh b/docker-builder-data/build/script/packet/synfigstudio-debug.sh
index c87c357..87b01d6 100644
--- a/docker-builder-data/build/script/packet/synfigstudio-debug.sh
+++ b/docker-builder-data/build/script/packet/synfigstudio-debug.sh
@@ -2,5 +2,5 @@ source "$PACKET_SCRIPT_DIR/synfigstudio-master.sh"
 
 DEPS=`echo "$DEPS" | sed "s|synfigcore-master|synfigcore-debug|g"`
 PK_URL="https://github.com/blackwarthog/$PK_DIRNAME.git"
-PK_GIT_OPTIONS="--branch debug"
+PK_GIT_CHECKOUT="origin/debug"
 PK_CONFIGURE_OPTIONS="--enable-debug --enable-optimization=0"
diff --git a/docker-builder-data/build/script/packet/synfigstudio-master.sh b/docker-builder-data/build/script/packet/synfigstudio-master.sh
index 58e85d2..2e435ce 100644
--- a/docker-builder-data/build/script/packet/synfigstudio-master.sh
+++ b/docker-builder-data/build/script/packet/synfigstudio-master.sh
@@ -28,7 +28,7 @@ fi
 
 PK_DIRNAME="synfig"
 PK_URL="https://github.com/synfig/$PK_DIRNAME.git"
-PK_GIT_OPTIONS="--branch testing"
+PK_GIT_CHECKOUT="origin/testing"
 PK_CPPFLAGS="-std=c++11"
 
 # put COPYING to front for license agreement page of NSIS installer
diff --git a/docker-builder-data/build/script/packet/wxphoenix-master.sh b/docker-builder-data/build/script/packet/wxphoenix-master.sh
index a462e6f..54ba9e5 100644
--- a/docker-builder-data/build/script/packet/wxphoenix-master.sh
+++ b/docker-builder-data/build/script/packet/wxphoenix-master.sh
@@ -4,6 +4,7 @@ DEPS="python-3.6.0 doxygen-1.8.8 python3requests-master gstreamerpluginsbase-0.1
 
 PK_DIRNAME="Phoenix"
 PK_URL="https://github.com/wxWidgets/$PK_DIRNAME.git"
+PK_GIT_CHECKOUT="tags/wxPython-4.0.0a2"
 
 PK_LICENSE_FILES=" \
     ext/wxWidgets/docs/readme.txt \
diff --git a/docker-builder-data/build/script/packet/x264-master.sh b/docker-builder-data/build/script/packet/x264-master.sh
index c3dd080..62dc938 100644
--- a/docker-builder-data/build/script/packet/x264-master.sh
+++ b/docker-builder-data/build/script/packet/x264-master.sh
@@ -2,6 +2,7 @@ DEPS_NATIVE="yasm-1.3.0"
 
 PK_DIRNAME="x264"
 PK_URL="http://git.videolan.org/git/$PK_DIRNAME.git"
+PK_GIT_CHECKOUT="d32d7bf1c6923a42cbd5ac2fd540ecbb009ba681"
 
 source $INCLUDE_SCRIPT_DIR/inc-pkall-git.sh