diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2e37a586fbc9debabd369f8efab7451049dfac06..59f70eb0adc79f192507f593686ef2d01a213c0b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,4 @@
 ---
-
 image:
   name: gcr.io/kaniko-project/executor:debug
   entrypoint: [""]
@@ -107,3 +106,15 @@ website-bullseye:
   stage: second
   variables:
     IMAGE_NAME: fsmpi-website
+
+astro-buster:
+  extends: .build-buster
+  stage: second
+  variables:
+    IMAGE_NAME: fsmpi-astro
+
+astro-bullseye:
+  extends: .build-bullseye
+  stage: second
+  variables:
+    IMAGE_NAME: fsmpi-astro
diff --git a/fsmpi-astro/Dockerfile b/fsmpi-astro/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..4cb65933dba9400567dd4dfc2c4230db43c8c2f4
--- /dev/null
+++ b/fsmpi-astro/Dockerfile
@@ -0,0 +1,5 @@
+ARG DEBIAN_RELEASE=bullseye
+FROM registry.git.fsmpi.rwth-aachen.de/infra/ci-containers/fsmpi-python:${DEBIAN_RELEASE}
+RUN apt-get update -y
+RUN apt-get install -y openssh-client rsync default-jre git
+RUN apt-get upgrade -y nodejs yarn