diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml
index 230992da..b3934cf1 100644
--- a/.github/workflows/integration-test.yml
+++ b/.github/workflows/integration-test.yml
@@ -9,7 +9,17 @@ jobs:
     timeout-minutes: 10
     strategy:
       matrix:
-        ENGINE_VERSION: [5.3.0, 5.6.1, latest]
+        include:
+          - ENGINE_IMAGE: registry.gitlab.com/minetest/minetest/server:5.5.0
+            MTG_VERSION: "5.5.0"
+          - ENGINE_IMAGE: registry.gitlab.com/minetest/minetest/server:5.6.0
+            MTG_VERSION: "5.6.0"
+          - ENGINE_IMAGE: registry.gitlab.com/minetest/minetest/server:5.7.0
+            MTG_VERSION: "5.7.0"
+          - ENGINE_IMAGE: ghcr.io/minetest-hosting/minetest-docker:5.8.0
+            MTG_VERSION: "5.8.0"
+          - ENGINE_IMAGE: ghcr.io/minetest-hosting/minetest-docker:main
+            MTG_VERSION: master
 
     steps:
     - uses: actions/checkout@v2
diff --git a/.test/Dockerfile b/.test/Dockerfile
index 6e2abc32..254cb80c 100644
--- a/.test/Dockerfile
+++ b/.test/Dockerfile
@@ -1,6 +1,7 @@
-ARG ENGINE_VERSION=5.5.0
-FROM registry.gitlab.com/minetest/minetest/server:${ENGINE_VERSION}
+ARG ENGINE_IMAGE=ghcr.io/minetest-hosting/minetest-docker:5.8.0
 
+FROM ${ENGINE_IMAGE}
+ARG MTG_VERSION=master
 USER root
 RUN apk add git &&\
     mkdir -p /root/.minetest/worlds/world/worldmods/ &&\
@@ -8,4 +9,8 @@ RUN apk add git &&\
     git clone --depth 1 https://github.com/BuckarooBanzay/mtt &&\
     git clone --recurse-submodules --depth 1 https://github.com/mt-mods/basic_materials.git &&\
     git clone --depth 1 https://github.com/mt-mods/pipeworks.git &&\
-    git clone --depth 1 https://github.com/minetest-mods/moreores.git
+    git clone --depth 1 https://github.com/minetest-mods/moreores.git &&\
+    mkdir /root/.minetest/games &&\
+    git clone https://github.com/minetest/minetest_game.git /root/.minetest/games/minetest &&\
+    cd /root/.minetest/games/minetest &&\
+    git checkout ${MTG_VERSION}
diff --git a/.test/minetest.conf b/.test/minetest.conf
index ebb30833..bd46a464 100644
--- a/.test/minetest.conf
+++ b/.test/minetest.conf
@@ -1,4 +1,3 @@
-default_game = minetest_game
 mg_name = v7
 mtt_enable = true
 deprecated_lua_api_handling = error
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 56e0ecdc..27c8c26d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,8 +5,9 @@ services:
   build:
    context: ./.test
    args:
-    ENGINE_VERSION: ${ENGINE_VERSION:-5.5.0}
-  entrypoint: "minetestserver --config /minetest.conf"
+    ENGINE_IMAGE: ${ENGINE_IMAGE:-ghcr.io/minetest-hosting/minetest-docker:5.8.0}
+    MTG_VERSION: ${MTG_VERSION:-5.8.0}
+  entrypoint: "minetestserver --config /minetest.conf --gameid minetest"
   user: root
   volumes:
     - "./:/root/.minetest/worlds/world/worldmods/technic/"
diff --git a/modpack.conf b/modpack.conf
index 6655ea87..580e8c6f 100644
--- a/modpack.conf
+++ b/modpack.conf
@@ -1,3 +1,3 @@
 name = technic
 description = The technic modpack extends the Minetest game with many new elements, mainly constructable machines and tools. It is a large modpack, and tends to dominate gameplay when it is used.
-min_minetest_version = 5.0
+min_minetest_version = 5.5