diff --git a/engines/1oom/build.sh b/engines/1oom/build.sh
index a669bb885..8b6eeb424 100755
--- a/engines/1oom/build.sh
+++ b/engines/1oom/build.sh
@@ -3,7 +3,7 @@
 # CLONE PHASE
 git clone https://gitlab.com/Tapani_/1oom.git source
 pushd source
-git checkout -f cc2b61c04c9bd11e17b06dc7b8d7c84760159842
+git checkout -f "$COMMIT_HASH"
 popd
 
 # BUILD PHASE
diff --git a/engines/1oom/env.json b/engines/1oom/env.json
new file mode 100644
index 000000000..3def22f98
--- /dev/null
+++ b/engines/1oom/env.json
@@ -0,0 +1,7 @@
+{
+    "STEAM_APP_ID_LIST": [
+        "410970"
+    ],
+    "LICENSE_PATH": "./source/COPYING",
+    "COMMIT_HASH": "cc2b61c04c9bd11e17b06dc7b8d7c84760159842"
+}
\ No newline at end of file
diff --git a/engines/1oom/env.sh b/engines/1oom/env.sh
deleted file mode 100755
index e776cacf0..000000000
--- a/engines/1oom/env.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-export STEAM_APP_ID_LIST="410970"
-export LICENSE_PATH="./source/COPYING"
diff --git a/engines/cnq3/build.sh b/engines/cnq3/build.sh
index 13760b44d..2cc607f5b 100755
--- a/engines/cnq3/build.sh
+++ b/engines/cnq3/build.sh
@@ -3,7 +3,7 @@
 # CLONE PHASE
 git clone https://bitbucket.org/CPMADevs/cnq3.git source
 pushd source
-git checkout 1b74aed
+git checkout "$COMMIT_HASH"
 popd
 
 
diff --git a/engines/cnq3/env.json b/engines/cnq3/env.json
new file mode 100644
index 000000000..df29ec0fb
--- /dev/null
+++ b/engines/cnq3/env.json
@@ -0,0 +1,14 @@
+{
+    "STEAM_APP_ID_LIST": [
+        "2200"
+    ],
+    "LICENSE_PATH": "./source/COPYING.txt",
+    "ADDITIONAL_LICENSES": [
+        "./source/id-readme.txt"
+    ],
+    "COMMON_PACKAGE": true,
+    "APT_LIBRARIES": [
+        "nasm"
+    ],
+    "COMMIT_HASH": "1b74aed"
+}
\ No newline at end of file
diff --git a/engines/cnq3/env.sh b/engines/cnq3/env.sh
deleted file mode 100755
index cd4e2a1bd..000000000
--- a/engines/cnq3/env.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-export STEAM_APP_ID_LIST="2200"
-export LICENSE_PATH="./source/COPYING.txt"
-export ADDITIONAL_LICENSES="./source/id-readme.txt"
-export COMMON_PACKAGE="1"
-export APT_LIBRARIES="nasm"
diff --git a/engines/commander-genius/build.sh b/engines/commander-genius/build.sh
index 0a3b877d8..a1dcd4c23 100755
--- a/engines/commander-genius/build.sh
+++ b/engines/commander-genius/build.sh
@@ -3,7 +3,7 @@
 # CLONE PHASE
 git clone https://gitlab.com/Dringgstein/Commander-Genius.git source
 pushd source
-git checkout 0b56993f
+git checkout "$COMMIT_HASH"
 popd
 
 # BUILD PHASE
diff --git a/engines/commander-genius/env.json b/engines/commander-genius/env.json
new file mode 100644
index 000000000..f75a32a8c
--- /dev/null
+++ b/engines/commander-genius/env.json
@@ -0,0 +1,7 @@
+{
+    "STEAM_APP_ID_LIST": [
+        "9180"
+    ],
+    "LICENSE_PATH": "./source/COPYRIGHT",
+    "COMMIT_HASH": "0b56993f"
+}
\ No newline at end of file
diff --git a/engines/commander-genius/env.sh b/engines/commander-genius/env.sh
deleted file mode 100755
index 84cb6643b..000000000
--- a/engines/commander-genius/env.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-export STEAM_APP_ID_LIST="9180"
-export LICENSE_PATH="./source/COPYRIGHT"
diff --git a/engines/doomseeker/build.sh b/engines/doomseeker/build.sh
index 6ae1d3640..591297439 100755
--- a/engines/doomseeker/build.sh
+++ b/engines/doomseeker/build.sh
@@ -3,7 +3,7 @@
 # CLONE PHASE
 git clone https://bitbucket.org/Doomseeker/doomseeker.git source
 pushd source
-git checkout -f 9fab457
+git checkout -f "$COMMIT_HASH"
 popd
 
 export CXXFLAGS="-m64 -mtune=generic -mfpmath=sse -msse -msse2 -pipe -Wno-unknown-pragmas"
diff --git a/engines/doomseeker/env.json b/engines/doomseeker/env.json
new file mode 100644
index 000000000..e999e2fe3
--- /dev/null
+++ b/engines/doomseeker/env.json
@@ -0,0 +1,15 @@
+{
+    "STEAM_APP_ID_LIST": [
+        "2280",
+        "2300"
+    ],
+    "LICENSE_PATH": "./source/LICENSE",
+    "COMMON_PACKAGE": true,
+    "LIBRARIES": [
+        "xcb",
+        "qt5",
+        "qt5tools"
+    ],
+    "ARCHIVE_WITHOUT_V7": true,
+    "COMMIT_HASH": "9fab457"
+}
\ No newline at end of file
diff --git a/engines/doomseeker/env.sh b/engines/doomseeker/env.sh
deleted file mode 100755
index 51e7bfef4..000000000
--- a/engines/doomseeker/env.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-export STEAM_APP_ID_LIST="2280 2300"
-export LICENSE_PATH="./source/LICENSE"
-export COMMON_PACKAGE="1"
-export LIBRARIES="xcb qt5 qt5tools"
-export ARCHIVE_WITHOUT_V7="1"
diff --git a/engines/ecwolf/build.sh b/engines/ecwolf/build.sh
index ad2b538e0..39ac6dd04 100755
--- a/engines/ecwolf/build.sh
+++ b/engines/ecwolf/build.sh
@@ -3,7 +3,7 @@
 # CLONE PHASE
 git clone https://bitbucket.org/ecwolf/ecwolf.git source
 pushd source
-git checkout 8cf8d23
+git checkout "$COMMIT_HASH"
 popd
 
 # BUILD PHASE
diff --git a/engines/ecwolf/env.json b/engines/ecwolf/env.json
new file mode 100644
index 000000000..11039913d
--- /dev/null
+++ b/engines/ecwolf/env.json
@@ -0,0 +1,10 @@
+{
+    "STEAM_APP_ID_LIST": [
+        "2270",
+        "9000",
+        "371180"
+    ],
+    "LICENSE_PATH": "./source/docs/copyright",
+    "COMMON_PACKAGE": true,
+    "COMMIT_HASH": "8cf8d23"
+}
\ No newline at end of file
diff --git a/engines/ecwolf/env.sh b/engines/ecwolf/env.sh
deleted file mode 100755
index 0a7e02080..000000000
--- a/engines/ecwolf/env.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-export STEAM_APP_ID_LIST="2270 9000 371180"
-export LICENSE_PATH="./source/docs/copyright"
-export COMMON_PACKAGE="1"
diff --git a/engines/eduke32/build.sh b/engines/eduke32/build.sh
index 620676d6b..0d07ac62d 100755
--- a/engines/eduke32/build.sh
+++ b/engines/eduke32/build.sh
@@ -5,7 +5,7 @@ git config --global http.sslverify false
 export GIT_SSL_NO_VERIFY=1
 git clone https://voidpoint.io/terminx/eduke32.git source
 pushd source
-git checkout 6537106e
+git checkout "$COMMIT_HASH"
 popd
 
 # BUILD PHASE
diff --git a/engines/eduke32/env.json b/engines/eduke32/env.json
new file mode 100644
index 000000000..f512c0f44
--- /dev/null
+++ b/engines/eduke32/env.json
@@ -0,0 +1,12 @@
+{
+    "STEAM_APP_ID_LIST": [
+        "225140",
+        "562860",
+        "329650",
+        "376750",
+        "434050"
+    ],
+    "LICENSE_PATH": "./source/source/duke3d/gpl-2.0.txt",
+    "COMMON_PACKAGE": true,
+    "COMMIT_HASH": "6537106e"
+}
\ No newline at end of file
diff --git a/engines/eduke32/env.sh b/engines/eduke32/env.sh
deleted file mode 100755
index 44981f6bd..000000000
--- a/engines/eduke32/env.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-export STEAM_APP_ID_LIST="225140 562860 329650 376750 434050"
-export LICENSE_PATH="./source/source/duke3d/gpl-2.0.txt"
-export COMMON_PACKAGE="1"
diff --git a/engines/homeworldsdl/build.sh b/engines/homeworldsdl/build.sh
index 7d8c32e5b..e28f00a8c 100755
--- a/engines/homeworldsdl/build.sh
+++ b/engines/homeworldsdl/build.sh
@@ -3,7 +3,7 @@
 # CLONE PHASE
 git clone https://gitlab.com/ThibaultLemaire/HomeworldSDL.git source
 pushd source
-git checkout 402e6c8d
+git checkout "$COMMIT_HASH"
 popd
 
 # BUILD PHASE
diff --git a/engines/homeworldsdl/env.json b/engines/homeworldsdl/env.json
new file mode 100644
index 000000000..1f8d95ab5
--- /dev/null
+++ b/engines/homeworldsdl/env.json
@@ -0,0 +1,7 @@
+{
+    "STEAM_APP_ID_LIST": [
+        "244160"
+    ],
+    "LICENSE_PATH": "./source/LICENSE.txt",
+    "COMMIT_HASH": "402e6c8d"
+}
\ No newline at end of file
diff --git a/engines/homeworldsdl/env.sh b/engines/homeworldsdl/env.sh
deleted file mode 100755
index 271ce6923..000000000
--- a/engines/homeworldsdl/env.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-export STEAM_APP_ID_LIST="244160"
-export LICENSE_PATH="./source/LICENSE.txt"
diff --git a/engines/netduke32/build.sh b/engines/netduke32/build.sh
index f21d55ef1..74271d321 100755
--- a/engines/netduke32/build.sh
+++ b/engines/netduke32/build.sh
@@ -5,7 +5,7 @@ git config --global http.sslverify false
 export GIT_SSL_NO_VERIFY=1
 git clone https://voidpoint.io/StrikerTheHedgefox/eduke32-csrefactor.git source
 pushd source
-git checkout f919616e
+git checkout "$COMMIT_HASH"
 popd
 
 # BUILD PHASE
diff --git a/engines/netduke32/env.json b/engines/netduke32/env.json
new file mode 100644
index 000000000..1b2ee3a0e
--- /dev/null
+++ b/engines/netduke32/env.json
@@ -0,0 +1,8 @@
+{
+    "STEAM_APP_ID_LIST": [
+        "225140"
+    ],
+    "LICENSE_PATH": "./source/source/duke3d/gpl-2.0.txt",
+    "COMMON_PACKAGE": true,
+    "COMMIT_HASH": "f919616e"
+}
\ No newline at end of file
diff --git a/engines/netduke32/env.sh b/engines/netduke32/env.sh
deleted file mode 100755
index 5cd1158fd..000000000
--- a/engines/netduke32/env.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-export STEAM_APP_ID_LIST="225140"
-export LICENSE_PATH="./source/source/duke3d/gpl-2.0.txt"
-export COMMON_PACKAGE="1"
diff --git a/engines/sc2/build.sh b/engines/sc2/build.sh
index 2f71db664..0d904dd71 100755
--- a/engines/sc2/build.sh
+++ b/engines/sc2/build.sh
@@ -3,7 +3,7 @@
 # CLONE PHASE
 git clone https://git.code.sf.net/p/sc2/uqm source
 pushd source
-git checkout 102099
+git checkout "$COMMIT_HASH"
 popd
 
 # BUILD PHASE
diff --git a/engines/sc2/env.json b/engines/sc2/env.json
new file mode 100644
index 000000000..a922ef305
--- /dev/null
+++ b/engines/sc2/env.json
@@ -0,0 +1,7 @@
+{
+    "STEAM_APP_ID_LIST": [
+        "2645580"
+    ],
+    "LICENSE_PATH": "./source/sc2/COPYING",
+    "COMMIT_HASH": "102099"
+}
\ No newline at end of file
diff --git a/engines/sc2/env.sh b/engines/sc2/env.sh
deleted file mode 100755
index 89a9cfe89..000000000
--- a/engines/sc2/env.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-export STEAM_APP_ID_LIST="2645580"
-export LICENSE_PATH="./source/sc2/COPYING"
diff --git a/engines/solarus/build.sh b/engines/solarus/build.sh
index 095c60826..fb78c88f1 100755
--- a/engines/solarus/build.sh
+++ b/engines/solarus/build.sh
@@ -3,7 +3,7 @@
 # CLONE PHASE
 git clone https://gitlab.com/solarus-games/solarus.git source
 pushd source
-git checkout 3aec70b0
+git checkout "$COMMIT_HASH"
 popd
 
 # BUILD PHASE
diff --git a/engines/solarus/env.json b/engines/solarus/env.json
new file mode 100644
index 000000000..d1d0a0ba8
--- /dev/null
+++ b/engines/solarus/env.json
@@ -0,0 +1,10 @@
+{
+    "STEAM_APP_ID_LIST": [
+        "1393750"
+    ],
+    "LICENSE_PATH": "./source/license_gpl.txt",
+    "APT_LIBRARIES": [
+        "libglm-dev"
+    ],
+    "COMMIT_HASH": "3aec70b0"
+}
\ No newline at end of file
diff --git a/engines/solarus/env.sh b/engines/solarus/env.sh
deleted file mode 100755
index 68dcb5983..000000000
--- a/engines/solarus/env.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-export STEAM_APP_ID_LIST="1393750"
-export LICENSE_PATH="./source/license_gpl.txt"
-export APT_LIBRARIES="libglm-dev"
diff --git a/engines/voidsw/build.sh b/engines/voidsw/build.sh
index e118f4aed..19245a3aa 100755
--- a/engines/voidsw/build.sh
+++ b/engines/voidsw/build.sh
@@ -5,7 +5,7 @@ git config --global http.sslverify false
 export GIT_SSL_NO_VERIFY=1
 git clone https://voidpoint.io/terminx/eduke32.git source
 pushd source
-git checkout 6537106e
+git checkout "$COMMIT_HASH"
 popd
 
 # BUILD PHASE
diff --git a/engines/voidsw/env.json b/engines/voidsw/env.json
new file mode 100644
index 000000000..6535612b0
--- /dev/null
+++ b/engines/voidsw/env.json
@@ -0,0 +1,8 @@
+{
+    "STEAM_APP_ID_LIST": [
+        "225160"
+    ],
+    "LICENSE_PATH": "./source/source/sw/gpl-2.0.txt",
+    "COMMON_PACKAGE": true,
+    "COMMIT_HASH": "6537106e"
+}
\ No newline at end of file
diff --git a/engines/voidsw/env.sh b/engines/voidsw/env.sh
deleted file mode 100755
index 5633341ae..000000000
--- a/engines/voidsw/env.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-export STEAM_APP_ID_LIST="225160"
-export LICENSE_PATH="./source/source/sw/gpl-2.0.txt"
-export COMMON_PACKAGE="1"