diff --git a/scripts/ci/jobs/ci_images.yml b/scripts/ci/jobs/ci_images.yml
index 22f69ce8aa1634d0dfe0bfb49f5d849ef248a30f..ee7e67a59cec884b8bac5f955c5dc698cb30c126 100644
--- a/scripts/ci/jobs/ci_images.yml
+++ b/scripts/ci/jobs/ci_images.yml
@@ -30,21 +30,13 @@ ci_images:
       dotenv: build.env
   script:
     - |
-      echo "CONTAINER_GCC_PM_OFF_IMAGE=${CONTAINER_REGISTRY}/gcc-pm-off:${CONTAINER_TAG}" >> build.env
       echo "XUNIT_TO_JUNIT_IMAGE=${CONTAINER_REGISTRY}/xunit-to-junit:${CONTAINER_TAG}" >> build.env
       echo "PRECOMMIT_IMAGE=${CONTAINER_REGISTRY}/pre-commit:${CONTAINER_TAG}" >> build.env
       echo "WEB_IMAGE=${CONTAINER_REGISTRY}/web:${CONTAINER_TAG}" >> build.env
       cat build.env
       if [ "${BUILD_CONTAINER}" != true ]; then exit 0; fi
     - source build.env
-    - !reference [.container-maker-setup, before_script]
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-    - poetry run ogscm compiler.py mpi.py ogs.py --build --ogs off
-      --pm off --ccache
-      --version_file ../../web/data/versions.json
-      --tag $CONTAINER_GCC_PM_OFF_IMAGE --upload
-      --cpu-target $CPU_TARGET
-      --packages build-essential jq moreutils
     - cd ${CI_PROJECT_DIR}
     - docker build --cache-from $XUNIT_TO_JUNIT_IMAGE -t $XUNIT_TO_JUNIT_IMAGE -f scripts/docker/saxon/Dockerfile scripts/docker/saxon
     - docker push $XUNIT_TO_JUNIT_IMAGE
diff --git a/scripts/ci/jobs/package.yml b/scripts/ci/jobs/package.yml
index 586fad8e534809ab4f53a7da0b85ad6ba6dc0bc7..bf48a8ef8751e93da98b142a4943342057a0ccaf 100644
--- a/scripts/ci/jobs/package.yml
+++ b/scripts/ci/jobs/package.yml
@@ -1,8 +1,7 @@
 create cpm cache:
   stage: package
-  tags: [docker]
-  needs: [meta, ci_images]
-  image: $CONTAINER_GCC_PM_OFF_IMAGE
+  tags: [envinf, shell]
+  needs: [meta]
   rules:
     - if: $CI_COMMIT_TITLE == "[versions] Updated cpm cache info."
       when: never
@@ -75,9 +74,8 @@ create cpm cache:
 
 offline configure:
   stage: package
-  tags: [docker]
-  needs: [meta, ci_images]
-  image: $CONTAINER_GCC_PM_OFF_IMAGE
+  tags: [envinf, shell]
+  needs: [meta]
   rules:
     # For testing: remove rules-directive
     - if: '$CI_COMMIT_BRANCH == "master"'