diff --git a/engines/augustus/build.sh b/engines/augustus/build.sh
index 6e795acae..aa59ef521 100755
--- a/engines/augustus/build.sh
+++ b/engines/augustus/build.sh
@@ -3,7 +3,7 @@
 # CLONE PHASE
 git clone https://github.com/Keriew/augustus.git source
 pushd source
-git checkout 3edf0f8
+git checkout "$COMMIT_TAG"
 popd
 
 # BUILD PHASE
diff --git a/engines/augustus/env.json b/engines/augustus/env.json
new file mode 100644
index 000000000..5b79fbb74
--- /dev/null
+++ b/engines/augustus/env.json
@@ -0,0 +1,7 @@
+{
+    "STEAM_APP_ID_LIST": [
+        "517790"
+    ],
+    "LICENSE_PATH": "./source/LICENSE.txt",
+    "COMMIT_TAG": "v4.0.0"
+}
\ No newline at end of file
diff --git a/engines/augustus/env.sh b/engines/augustus/env.sh
deleted file mode 100755
index fd30ac3ba..000000000
--- a/engines/augustus/env.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-export STEAM_APP_ID_LIST="517790"
-export LICENSE_PATH="./source/LICENSE.txt"
diff --git a/engines/bstone/build.sh b/engines/bstone/build.sh
index d252ca0a8..53418f980 100755
--- a/engines/bstone/build.sh
+++ b/engines/bstone/build.sh
@@ -3,7 +3,7 @@
 # CLONE PHASE
 git clone https://github.com/bibendovsky/bstone.git source
 pushd source
-git checkout e44d3aa
+git checkout "$COMMIT_TAG"
 popd
 
 # BUILD PHASE
diff --git a/engines/bstone/env.json b/engines/bstone/env.json
new file mode 100644
index 000000000..28b07e255
--- /dev/null
+++ b/engines/bstone/env.json
@@ -0,0 +1,10 @@
+{
+    "STEAM_APP_ID_LIST": [
+        "238050",
+        "358190",
+        "358310"
+    ],
+    "LICENSE_PATH": "./source/LICENSE",
+    "COMMON_PACKAGE": true,
+    "COMMIT_TAG": "v1.2.12"
+}
\ No newline at end of file
diff --git a/engines/bstone/env.sh b/engines/bstone/env.sh
deleted file mode 100755
index 4e76dfd79..000000000
--- a/engines/bstone/env.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-export STEAM_APP_ID_LIST="238050 358190 358310"
-export LICENSE_PATH="./source/LICENSE"
-export COMMON_PACKAGE="1"
diff --git a/engines/crispy-doom/build.sh b/engines/crispy-doom/build.sh
index 4ec98acff..48d1f0aed 100755
--- a/engines/crispy-doom/build.sh
+++ b/engines/crispy-doom/build.sh
@@ -3,7 +3,7 @@
 # CLONE PHASE
 git clone https://github.com/fabiangreffrath/crispy-doom.git source
 pushd source
-git checkout 593f5b9
+git checkout "$COMMIT_TAG"
 popd
 
 # BUILD PHASE
diff --git a/engines/crispy-doom/env.json b/engines/crispy-doom/env.json
new file mode 100644
index 000000000..fa1eb17ce
--- /dev/null
+++ b/engines/crispy-doom/env.json
@@ -0,0 +1,13 @@
+{
+    "STEAM_APP_ID_LIST": [
+        "2390",
+        "2360",
+        "2370",
+        "2280",
+        "2300",
+        "2290"
+    ],
+    "LICENSE_PATH": "./source/COPYING.md",
+    "COMMON_PACKAGE": true,
+    "COMMIT_TAG": "crispy-doom-6.0"
+}
\ No newline at end of file
diff --git a/engines/crispy-doom/env.sh b/engines/crispy-doom/env.sh
deleted file mode 100755
index c838549c1..000000000
--- a/engines/crispy-doom/env.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-export STEAM_APP_ID_LIST="2390 2360 2370 2280 2300 2290"
-export LICENSE_PATH="./source/COPYING.md"
-export COMMON_PACKAGE="1"
diff --git a/engines/dhewm3/build.sh b/engines/dhewm3/build.sh
index c62f49135..3ffb74f73 100755
--- a/engines/dhewm3/build.sh
+++ b/engines/dhewm3/build.sh
@@ -3,7 +3,7 @@
 # CLONE PHASE
 git clone https://github.com/dhewm/dhewm3.git source
 pushd source
-git checkout 2e71b99
+git checkout "$COMMIT_TAG"
 popd
 
 # BUILD PHASE
diff --git a/engines/dhewm3/env.json b/engines/dhewm3/env.json
new file mode 100644
index 000000000..51b27ba3d
--- /dev/null
+++ b/engines/dhewm3/env.json
@@ -0,0 +1,13 @@
+{
+    "STEAM_APP_ID_LIST": [
+        "9050",
+        "9070",
+        "9100"
+    ],
+    "LICENSE_PATH": "./source/COPYING.txt",
+    "ADDITIONAL_LICENSES": [
+        "./source/README.md"
+    ],
+    "COMMON_PACKAGE": true,
+    "COMMIT_TAG": "1.5.2"
+}
\ No newline at end of file
diff --git a/engines/dhewm3/env.sh b/engines/dhewm3/env.sh
deleted file mode 100755
index db47b4f54..000000000
--- a/engines/dhewm3/env.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-export STEAM_APP_ID_LIST="9050 9070 9100"
-export LICENSE_PATH="./source/COPYING.txt"
-export ADDITIONAL_LICENSES="./source/README.md"
-export COMMON_PACKAGE="1"
diff --git a/engines/doom-retro/build.sh b/engines/doom-retro/build.sh
index 62addd347..c34550671 100755
--- a/engines/doom-retro/build.sh
+++ b/engines/doom-retro/build.sh
@@ -6,7 +6,7 @@ export LIBRARY_PATH="$VCPKG_INSTALLED_PATH/lib"
 # CLONE PHASE
 git clone https://github.com/bradharding/doomretro.git source
 pushd source
-git checkout 7c788ad
+git checkout "$COMMIT_TAG"
 popd
 
 # BUILD PHASE
diff --git a/engines/doom-retro/env.json b/engines/doom-retro/env.json
new file mode 100644
index 000000000..08ad76706
--- /dev/null
+++ b/engines/doom-retro/env.json
@@ -0,0 +1,10 @@
+{
+    "STEAM_APP_ID_LIST": [
+        "2280",
+        "2300",
+        "2290"
+    ],
+    "LICENSE_PATH": "./source/LICENSE",
+    "COMMON_PACKAGE": true,
+    "COMMIT_TAG": "v5.2.1"
+}
\ No newline at end of file
diff --git a/engines/doom-retro/env.sh b/engines/doom-retro/env.sh
deleted file mode 100755
index d88b6e255..000000000
--- a/engines/doom-retro/env.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-
-#!/bin/bash
-
-export STEAM_APP_ID_LIST="2280 2300 2290"
-export LICENSE_PATH="./source/LICENSE"
-export COMMON_PACKAGE="1"
diff --git a/engines/doom-runner/build.sh b/engines/doom-runner/build.sh
index 7a2ae7661..567e21a00 100755
--- a/engines/doom-runner/build.sh
+++ b/engines/doom-runner/build.sh
@@ -3,7 +3,7 @@
 # CLONE PHASE
 git clone https://github.com/Youda008/DoomRunner.git source
 pushd source
-git checkout -f cad2dcf
+git checkout -f "$COMMIT_TAG"
 popd
 
 export CXXFLAGS="-m64 -mtune=generic -mfpmath=sse -msse -msse2 -pipe -Wno-unknown-pragmas"
diff --git a/engines/doom-runner/env.json b/engines/doom-runner/env.json
new file mode 100644
index 000000000..facc6901a
--- /dev/null
+++ b/engines/doom-runner/env.json
@@ -0,0 +1,20 @@
+{
+    "STEAM_APP_ID_LIST": [
+        "2280",
+        "2300",
+        "2360",
+        "2390",
+        "2370",
+        "2290",
+        "9160",
+        "782330"
+    ],
+    "LICENSE_PATH": "./source/LICENSE",
+    "COMMON_PACKAGE": true,
+    "LIBRARIES": [
+        "xcb",
+        "qt5"
+    ],
+    "ARCHIVE_WITHOUT_V7": true,
+    "COMMIT_TAG": "v1.8.2"
+}
\ No newline at end of file
diff --git a/engines/doom-runner/env.sh b/engines/doom-runner/env.sh
deleted file mode 100755
index 56e5f2c54..000000000
--- a/engines/doom-runner/env.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-export STEAM_APP_ID_LIST="2280 2300 2360 2390 2370 2290 9160 782330"
-export LICENSE_PATH="./source/LICENSE"
-export COMMON_PACKAGE="1"
-export LIBRARIES="xcb qt5"
-export ARCHIVE_WITHOUT_V7="1"
diff --git a/engines/doom64ex-plus/build.sh b/engines/doom64ex-plus/build.sh
index 1d3ed3584..820ed008d 100755
--- a/engines/doom64ex-plus/build.sh
+++ b/engines/doom64ex-plus/build.sh
@@ -4,7 +4,7 @@
 # CLONE PHASE
 git clone https://github.com/atsb/Doom64EX-Plus.git source
 pushd source
-git checkout 808e6dd
+git checkout "$COMMIT_TAG"
 popd
 
 # BUILD PHASE
diff --git a/engines/doom64ex-plus/env.json b/engines/doom64ex-plus/env.json
new file mode 100644
index 000000000..0310ed0a2
--- /dev/null
+++ b/engines/doom64ex-plus/env.json
@@ -0,0 +1,10 @@
+{
+    "STEAM_APP_ID_LIST": [
+        "1148590"
+    ],
+    "LICENSE_PATH": "./source/LICENSE",
+    "ADDITIONAL_LICENSES": [
+        "./LICENSE"
+    ],
+    "COMMIT_TAG": "3.6.5.9"
+}
\ No newline at end of file
diff --git a/engines/doom64ex-plus/env.sh b/engines/doom64ex-plus/env.sh
deleted file mode 100644
index 0f053ad3a..000000000
--- a/engines/doom64ex-plus/env.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-export STEAM_APP_ID_LIST="1148590"
-export LICENSE_PATH="./source/LICENSE"
-export ADDITIONAL_LICENSES="./LICENSE"
diff --git a/engines/dsda-doom/build.sh b/engines/dsda-doom/build.sh
index 4eb3d5f01..042dc0b82 100755
--- a/engines/dsda-doom/build.sh
+++ b/engines/dsda-doom/build.sh
@@ -3,7 +3,7 @@
 # CLONE PHASE
 git clone https://github.com/kraflab/dsda-doom.git source
 pushd source
-git checkout 805f078
+git checkout "$COMMIT_TAG"
 popd
 
 # BUILD PHASE
diff --git a/engines/dsda-doom/env.json b/engines/dsda-doom/env.json
new file mode 100644
index 000000000..7d70aad0c
--- /dev/null
+++ b/engines/dsda-doom/env.json
@@ -0,0 +1,12 @@
+{
+    "STEAM_APP_ID_LIST": [
+        "2280",
+        "2290",
+        "2300",
+        "2390",
+        "2290"
+    ],
+    "LICENSE_PATH": "./source/prboom2/COPYING",
+    "COMMON_PACKAGE": true,
+    "COMMIT_TAG": "v0.27.5"
+}
\ No newline at end of file
diff --git a/engines/dsda-doom/env.sh b/engines/dsda-doom/env.sh
deleted file mode 100755
index 2f95966c3..000000000
--- a/engines/dsda-doom/env.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-export STEAM_APP_ID_LIST="2280 2290 2300 2390 2290"
-export LICENSE_PATH="./source/prboom2/COPYING"
-export COMMON_PACKAGE="1"
diff --git a/engines/inter-doom/build.sh b/engines/inter-doom/build.sh
index 9865d6db7..daf643d87 100755
--- a/engines/inter-doom/build.sh
+++ b/engines/inter-doom/build.sh
@@ -3,7 +3,7 @@
 # CLONE PHASE
 git clone https://github.com/JNechaevsky/inter-doom.git source
 pushd source
-git checkout 303f20b
+git checkout "$COMMIT_TAG"
 popd
 
 # BUILD PHASE
diff --git a/engines/inter-doom/env.json b/engines/inter-doom/env.json
new file mode 100644
index 000000000..f9d9bade5
--- /dev/null
+++ b/engines/inter-doom/env.json
@@ -0,0 +1,10 @@
+{
+    "STEAM_APP_ID_LIST": [
+        "2300",
+        "2280",
+        "2290"
+    ],
+    "LICENSE_PATH": "./source/COPYING",
+    "COMMON_PACKAGE": true,
+    "COMMIT_TAG": "7.3"
+}
\ No newline at end of file
diff --git a/engines/inter-doom/env.sh b/engines/inter-doom/env.sh
deleted file mode 100755
index c3c7b4f90..000000000
--- a/engines/inter-doom/env.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-export STEAM_APP_ID_LIST="2300 2280 2290"
-export LICENSE_PATH="./source/COPYING"
-export COMMON_PACKAGE="1"
diff --git a/engines/ironwail/build.sh b/engines/ironwail/build.sh
index 065b763a2..2a20950e4 100755
--- a/engines/ironwail/build.sh
+++ b/engines/ironwail/build.sh
@@ -8,7 +8,7 @@ export LIBRARY_PATH="$VCPKG_INSTALLED_PATH/lib"
 # CLONE PHASE
 git clone https://github.com/andrei-drexler/ironwail.git source
 pushd source
-git checkout 5b130aa
+git checkout "$COMMIT_TAG"
 popd
 
 # BUILD PHASE
diff --git a/engines/ironwail/env.json b/engines/ironwail/env.json
new file mode 100644
index 000000000..5e1be303b
--- /dev/null
+++ b/engines/ironwail/env.json
@@ -0,0 +1,11 @@
+{
+    "STEAM_APP_ID_LIST": [
+        "2310"
+    ],
+    "LICENSE_PATH": "./source/LICENSE.txt",
+    "ADDITIONAL_LICENSES": [
+        "./LICENSE"
+    ],
+    "COMMON_PACKAGE": true,
+    "COMMIT_TAG": "v0.7.0"
+}
\ No newline at end of file
diff --git a/engines/ironwail/env.sh b/engines/ironwail/env.sh
deleted file mode 100755
index f3a6086a4..000000000
--- a/engines/ironwail/env.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-export STEAM_APP_ID_LIST="2310"
-export LICENSE_PATH="./source/LICENSE.txt"
-export ADDITIONAL_LICENSES="./LICENSE"
-export COMMON_PACKAGE="1"
diff --git a/engines/julius/build.sh b/engines/julius/build.sh
index 739959756..44ae91ef8 100755
--- a/engines/julius/build.sh
+++ b/engines/julius/build.sh
@@ -3,7 +3,7 @@
 # CLONE PHASE
 git clone https://github.com/bvschaik/julius.git source
 pushd source
-git checkout d026eb2
+git checkout "$COMMIT_TAG"
 popd
 
 # BUILD PHASE
diff --git a/engines/julius/env.json b/engines/julius/env.json
new file mode 100644
index 000000000..67e38a6b4
--- /dev/null
+++ b/engines/julius/env.json
@@ -0,0 +1,7 @@
+{
+    "STEAM_APP_ID_LIST": [
+        "517790"
+    ],
+    "LICENSE_PATH": "./source/LICENSE.txt",
+    "COMMIT_TAG": "v1.7.0"
+}
\ No newline at end of file
diff --git a/engines/julius/env.sh b/engines/julius/env.sh
deleted file mode 100755
index fd30ac3ba..000000000
--- a/engines/julius/env.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-export STEAM_APP_ID_LIST="517790"
-export LICENSE_PATH="./source/LICENSE.txt"
diff --git a/engines/prboom-plus/build.sh b/engines/prboom-plus/build.sh
index 7190ba943..bc8435a73 100755
--- a/engines/prboom-plus/build.sh
+++ b/engines/prboom-plus/build.sh
@@ -3,7 +3,7 @@
 # CLONE PHASE
 git clone https://github.com/coelckers/prboom-plus.git source
 pushd source
-git checkout 9695151
+git checkout "$COMMIT_TAG"
 popd
 
 # BUILD PHASE
diff --git a/engines/prboom-plus/env.json b/engines/prboom-plus/env.json
new file mode 100644
index 000000000..863b0c199
--- /dev/null
+++ b/engines/prboom-plus/env.json
@@ -0,0 +1,12 @@
+{
+    "STEAM_APP_ID_LIST": [
+        "2280",
+        "2290",
+        "2300",
+        "2390",
+        "2290"
+    ],
+    "LICENSE_PATH": "./source/prboom2/COPYING",
+    "COMMON_PACKAGE": true,
+    "COMMIT_TAG": "v2.6.66"
+}
\ No newline at end of file
diff --git a/engines/prboom-plus/env.sh b/engines/prboom-plus/env.sh
deleted file mode 100755
index 2f95966c3..000000000
--- a/engines/prboom-plus/env.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-export STEAM_APP_ID_LIST="2280 2290 2300 2390 2290"
-export LICENSE_PATH="./source/prboom2/COPYING"
-export COMMON_PACKAGE="1"
diff --git a/engines/qss-m/build.sh b/engines/qss-m/build.sh
index 31ee20351..b59dc6f57 100755
--- a/engines/qss-m/build.sh
+++ b/engines/qss-m/build.sh
@@ -8,7 +8,7 @@ export LIBRARY_PATH="$VCPKG_INSTALLED_PATH/lib"
 # CLONE PHASE
 git clone https://github.com/timbergeron/QSS-M.git source
 pushd source
-git checkout e9cb3a2
+git checkout "$COMMIT_TAG"
 popd
 
 # BUILD PHASE
diff --git a/engines/qss-m/env.json b/engines/qss-m/env.json
new file mode 100644
index 000000000..e2bc771ce
--- /dev/null
+++ b/engines/qss-m/env.json
@@ -0,0 +1,13 @@
+{
+    "STEAM_APP_ID_LIST": [
+        "2310",
+        "9040",
+        "9030"
+    ],
+    "LICENSE_PATH": "./source/LICENSE.txt",
+    "ADDITIONAL_LICENSES": [
+        "./LICENSE"
+    ],
+    "COMMON_PACKAGE": true,
+    "COMMIT_TAG": "1.5.5"
+}
\ No newline at end of file
diff --git a/engines/qss-m/env.sh b/engines/qss-m/env.sh
deleted file mode 100755
index a12f9ae8f..000000000
--- a/engines/qss-m/env.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-export STEAM_APP_ID_LIST="2310 9040 9030"
-export LICENSE_PATH="./source/LICENSE.txt"
-export ADDITIONAL_LICENSES="./LICENSE"
-export COMMON_PACKAGE="1"
diff --git a/engines/rbdoom-3-bfg/build.sh b/engines/rbdoom-3-bfg/build.sh
index dc6ff8ed4..81e2d3d71 100755
--- a/engines/rbdoom-3-bfg/build.sh
+++ b/engines/rbdoom-3-bfg/build.sh
@@ -14,7 +14,7 @@ sudo ldconfig
 # CLONE PHASE
 git clone https://github.com/RobertBeckebans/RBDOOM-3-BFG.git source
 pushd source
-git checkout 39ae120
+git checkout "$COMMIT_TAG"
 git submodule update --init --recursive
 popd
 
diff --git a/engines/rbdoom-3-bfg/env.json b/engines/rbdoom-3-bfg/env.json
new file mode 100644
index 000000000..763537552
--- /dev/null
+++ b/engines/rbdoom-3-bfg/env.json
@@ -0,0 +1,11 @@
+{
+    "STEAM_APP_ID_LIST": [
+        "208200"
+    ],
+    "LICENSE_PATH": "./source/LICENSE.md",
+    "ADDITIONAL_LICENSES": [
+        "./source/LICENSE_EXCEPTIONS.md",
+        "./source/neo/extern/nvrhi/LICENSE.txt"
+    ],
+    "COMMIT_TAG": "v1.5.1"
+}
\ No newline at end of file
diff --git a/engines/rbdoom-3-bfg/env.sh b/engines/rbdoom-3-bfg/env.sh
deleted file mode 100755
index 43bec1df0..000000000
--- a/engines/rbdoom-3-bfg/env.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-export STEAM_APP_ID_LIST="208200"
-export LICENSE_PATH="./source/LICENSE.md"
-export ADDITIONAL_LICENSES="./source/LICENSE_EXCEPTIONS.md ./source/neo/extern/nvrhi/LICENSE.txt"
diff --git a/engines/rigelengine/build.sh b/engines/rigelengine/build.sh
index 8861cdd35..66ed1233b 100755
--- a/engines/rigelengine/build.sh
+++ b/engines/rigelengine/build.sh
@@ -3,7 +3,7 @@
 # CLONE PHASE
 git clone https://github.com/lethal-guitar/RigelEngine.git source
 pushd source
-git checkout 84ae53f
+git checkout "$COMMIT_TAG"
 git submodule update --init --recursive
 popd
 
diff --git a/engines/rigelengine/env.json b/engines/rigelengine/env.json
new file mode 100644
index 000000000..e5dc59fc5
--- /dev/null
+++ b/engines/rigelengine/env.json
@@ -0,0 +1,7 @@
+{
+    "STEAM_APP_ID_LIST": [
+        "240180"
+    ],
+    "LICENSE_PATH": "./source/LICENSE.md",
+    "COMMIT_TAG": "v0.9.1"
+}
\ No newline at end of file
diff --git a/engines/rigelengine/env.sh b/engines/rigelengine/env.sh
deleted file mode 100755
index 3b0d59017..000000000
--- a/engines/rigelengine/env.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-export STEAM_APP_ID_LIST="240180"
-export LICENSE_PATH="./source/LICENSE.md"
diff --git a/engines/rottexpr/build.sh b/engines/rottexpr/build.sh
index cd006e5eb..76dc4bf50 100755
--- a/engines/rottexpr/build.sh
+++ b/engines/rottexpr/build.sh
@@ -3,7 +3,7 @@
 # CLONE PHASE
 git clone https://github.com/LTCHIPS/rottexpr.git source
 pushd source
-git checkout 407e3d8
+git checkout "$COMMIT_TAG"
 popd
 
 # BUILD PHASE
diff --git a/engines/rottexpr/env.json b/engines/rottexpr/env.json
new file mode 100644
index 000000000..8ad2ace84
--- /dev/null
+++ b/engines/rottexpr/env.json
@@ -0,0 +1,8 @@
+{
+    "STEAM_APP_ID_LIST": [
+        "238050",
+        "358410"
+    ],
+    "LICENSE_PATH": "./source/COPYING",
+    "COMMIT_TAG": "v0.01"
+}
\ No newline at end of file
diff --git a/engines/rottexpr/env.sh b/engines/rottexpr/env.sh
deleted file mode 100755
index aad0e7dad..000000000
--- a/engines/rottexpr/env.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-export STEAM_APP_ID_LIST="238050 358410"
-export LICENSE_PATH="./source/COPYING"
diff --git a/engines/russian-doom/build.sh b/engines/russian-doom/build.sh
index 1031810e5..5ab9d1388 100755
--- a/engines/russian-doom/build.sh
+++ b/engines/russian-doom/build.sh
@@ -6,7 +6,7 @@ export pfx="$PWD/local"
 # CLONE PHASE
 git clone https://github.com/Russian-Doom/russian-doom.git source
 pushd source
-git checkout e97fdcb
+git checkout "$COMMIT_TAG"
 popd
 
 # BUILD PHASE
diff --git a/engines/russian-doom/env.json b/engines/russian-doom/env.json
new file mode 100644
index 000000000..e39e41e7b
--- /dev/null
+++ b/engines/russian-doom/env.json
@@ -0,0 +1,13 @@
+{
+    "STEAM_APP_ID_LIST": [
+        "2390",
+        "2360",
+        "2370",
+        "2300",
+        "2280",
+        "2290"
+    ],
+    "LICENSE_PATH": "./source/LICENSE.txt",
+    "COMMON_PACKAGE": true,
+    "COMMIT_TAG": "6.3"
+}
\ No newline at end of file
diff --git a/engines/russian-doom/env.sh b/engines/russian-doom/env.sh
deleted file mode 100755
index fb74add5a..000000000
--- a/engines/russian-doom/env.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-export STEAM_APP_ID_LIST="2390 2360 2370 2300 2280 2290"
-export LICENSE_PATH="./source/LICENSE.txt"
-export COMMON_PACKAGE="1"
diff --git a/engines/serious-engine/build.sh b/engines/serious-engine/build.sh
index ecd0cd85a..61ac9acbd 100755
--- a/engines/serious-engine/build.sh
+++ b/engines/serious-engine/build.sh
@@ -3,7 +3,7 @@
 # CLONE PHASE
 git clone https://github.com/tx00100xt/SeriousSamClassic-VK.git source
 pushd source
-git checkout 8288d768305ff9f2c1148bf09c5fc767d41cae51
+git checkout "$COMMIT_TAG"
 popd
 
 # BUILD PHASE
diff --git a/engines/serious-engine/env.json b/engines/serious-engine/env.json
new file mode 100644
index 000000000..4914bc013
--- /dev/null
+++ b/engines/serious-engine/env.json
@@ -0,0 +1,11 @@
+{
+    "STEAM_APP_ID_LIST": [
+        "41050",
+        "41060"
+    ],
+    "LICENSE_PATH": "./source/LICENSE",
+    "APT_LIBRARIES": [
+        "nasm"
+    ],
+    "COMMIT_TAG": "1.10.6d"
+}
\ No newline at end of file
diff --git a/engines/serious-engine/env.sh b/engines/serious-engine/env.sh
deleted file mode 100755
index 9ac8ab7af..000000000
--- a/engines/serious-engine/env.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-export STEAM_APP_ID_LIST="41050 41060"
-export LICENSE_PATH="./source/LICENSE"
-export APT_LIBRARIES="nasm"
diff --git a/engines/vkquake/build.sh b/engines/vkquake/build.sh
index 29b54092d..a2b2aacc7 100755
--- a/engines/vkquake/build.sh
+++ b/engines/vkquake/build.sh
@@ -21,7 +21,7 @@ sudo ldconfig
 # CLONE PHASE
 git clone https://github.com/Novum/vkQuake source
 pushd source
-git checkout 6bc4735
+git checkout "$COMMIT_TAG"
 popd
 
 # BUILD PHASE
diff --git a/engines/vkquake/env.json b/engines/vkquake/env.json
new file mode 100644
index 000000000..baefa370a
--- /dev/null
+++ b/engines/vkquake/env.json
@@ -0,0 +1,11 @@
+{
+    "STEAM_APP_ID_LIST": [
+        "2310"
+    ],
+    "LICENSE_PATH": "./source/LICENSE.txt",
+    "ADDITIONAL_LICENSES": [
+        "./LICENSE"
+    ],
+    "COMMON_PACKAGE": true,
+    "COMMIT_TAG": "1.30.1"
+}
\ No newline at end of file
diff --git a/engines/vkquake/env.sh b/engines/vkquake/env.sh
deleted file mode 100755
index f3a6086a4..000000000
--- a/engines/vkquake/env.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-export STEAM_APP_ID_LIST="2310"
-export LICENSE_PATH="./source/LICENSE.txt"
-export ADDITIONAL_LICENSES="./LICENSE"
-export COMMON_PACKAGE="1"
diff --git a/engines/vkquake2/build.sh b/engines/vkquake2/build.sh
index 9a4c6cba9..f9daef7f6 100755
--- a/engines/vkquake2/build.sh
+++ b/engines/vkquake2/build.sh
@@ -6,7 +6,7 @@ export CFLAGS="-m64 -mtune=generic -mfpmath=sse -msse -msse2 -pipe -Wno-unknown-
 # CLONE PHASE
 git clone https://github.com/kondrak/vkQuake2.git source
 pushd source
-git checkout bdd39b1
+git checkout "$COMMIT_TAG"
 popd
 
 curl -L -v -o libXxf86dga-1.1.5.tar.bz2 http://www.x.org/releases/individual/lib/libXxf86dga-1.1.5.tar.bz2
diff --git a/engines/vkquake2/env.json b/engines/vkquake2/env.json
new file mode 100644
index 000000000..69cd9a184
--- /dev/null
+++ b/engines/vkquake2/env.json
@@ -0,0 +1,12 @@
+{
+    "STEAM_APP_ID_LIST": [
+        "2320",
+        "9130"
+    ],
+    "LICENSE_PATH": "./source/LICENSE",
+    "ADDITIONAL_LICENSES": [
+        "./libXxf86dga-1.1.5/COPYING"
+    ],
+    "COMMON_PACKAGE": true,
+    "COMMIT_TAG": "1.5.9"
+}
\ No newline at end of file
diff --git a/engines/vkquake2/env.sh b/engines/vkquake2/env.sh
deleted file mode 100755
index e99a02e0a..000000000
--- a/engines/vkquake2/env.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-export STEAM_APP_ID_LIST="2320 9130"
-export LICENSE_PATH="./source/LICENSE"
-export ADDITIONAL_LICENSES="./libXxf86dga-1.1.5/COPYING"
-export COMMON_PACKAGE="1"
diff --git a/engines/woof/build.sh b/engines/woof/build.sh
index d592b910b..56f576b15 100755
--- a/engines/woof/build.sh
+++ b/engines/woof/build.sh
@@ -6,7 +6,7 @@ export LIBRARY_PATH="$VCPKG_INSTALLED_PATH/lib"
 # CLONE PHASE
 git clone https://github.com/fabiangreffrath/woof.git source
 pushd source
-git checkout b314785
+git checkout "$COMMIT_TAG"
 popd
 
 # BUILD PHASE
diff --git a/engines/woof/env.json b/engines/woof/env.json
new file mode 100644
index 000000000..548e15b29
--- /dev/null
+++ b/engines/woof/env.json
@@ -0,0 +1,10 @@
+{
+    "STEAM_APP_ID_LIST": [
+        "2280",
+        "2300",
+        "2290"
+    ],
+    "LICENSE_PATH": "./source/COPYING",
+    "COMMON_PACKAGE": true,
+    "COMMIT_TAG": "woof_14.1.0"
+}
\ No newline at end of file
diff --git a/engines/woof/env.sh b/engines/woof/env.sh
deleted file mode 100755
index d47f72297..000000000
--- a/engines/woof/env.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-
-#!/bin/bash
-
-export STEAM_APP_ID_LIST="2280 2300 2290"
-export LICENSE_PATH="./source/COPYING"
-export COMMON_PACKAGE="1"