diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f2660a2..faab991 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,12 +15,14 @@ test:
 push:
   stage: push
   image:
-    name: gcr.io/kaniko-project/executor:debug
-    entrypoint: [""]
+    name: docker:19.03.12
   rules:
     - if: $CI_COMMIT_TAG
     - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
   script:
-    - mkdir -p /kaniko/.docker
-    - echo "$DOCKER_AUTH_CONFIG" > /kaniko/.docker/config.json
-    - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/build/package/Containerfile --destination ghcr.io/dirtbags/moth:$CI_COMMIT_REF_SLUG
+    - echo "$DOCKER_AUTH_CONFIG" > !~.docker/config.json
+    - >
+      docker build 
+      --tag ghcr.io/dirtbags/moth:$CI_COMMIT_REF_SLUG
+      --file build/package/Containerfile
+      .
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 685cba1..3c87828 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 - Many error messages were changed to start with a lower-case letter, 
   in order to satisfy a new linter check.
+- CI/CD moved to our Cyber Fire Gitlab instance
 
 ## [v4.2.2] - 2021-09-30
 ### Added
diff --git a/build/package/Containerfile b/build/package/Containerfile
index b13d8f5..238db91 100644
--- a/build/package/Containerfile
+++ b/build/package/Containerfile
@@ -7,7 +7,7 @@ COPY example-puzzles /target/puzzles/
 COPY LICENSE.md /target/
 RUN mkdir -p /target/state
 WORKDIR /src/
-RUN CGO_ENABLED=0 GOOS=linux go install -i -a -ldflags '-extldflags "-static"' ./...
+RUN CGO_ENABLED=0 GOOS=linux go install -a -ldflags '-extldflags "-static"' ./...
 # I can't use /target/bin: doing so would cause the devel server to overwrite Ubuntu's /bin
 
 ##########