diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..7913a68
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,23 @@
+image: quay.io/podman/stable
+
+stages:
+  - build
+  - publish
+
+variables:
+  IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
+
+before_script:
+  - echo -n $CI_REGISTRY_PASSWORD | podman login -u "$CI_REGISTRY_USER" --password-stdin $CI_REGISTRY
+
+build:
+  stage: build
+  script:
+    - podman build .
+
+publish:
+  stage: publish
+  script:
+    - podman build -t $IMAGE_TAG .
+    - podman push $IMAGE_TAG
+  when: manual
diff --git a/Containerfile b/Containerfile
index 4a2e1e4..7b827ab 100644
--- a/Containerfile
+++ b/Containerfile
@@ -1,8 +1,6 @@
-# Podman for running in container pre-installed
-# See https://www.redhat.com/en/blog/podman-inside-container
-FROM quay.io/podman/stable
+FROM docker.io/fedora:40
 
 RUN dnf install -y java-21-openjdk-headless nodejs python \
-  gcc gcc-c++ git graphviz ruby
+  gcc gcc-c++ git podman graphviz ruby
 
 CMD ["/bin/bash"]