diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 79ac1fc..33ff5fa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -63,16 +63,16 @@ ncc-docker:
       exists:
         - Dockerfile
 
-ncc-docker-alpine:
+ncc-docker-debian:
   image: docker:latest
   services:
     - docker:dind
   before_script:
     - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
   script:
-    - docker build --pull -t "$CI_REGISTRY_IMAGE${tag}-alpine" .
-    - docker push "$CI_REGISTRY_IMAGE${tag}-alpine"
+    - docker build --pull -t "$CI_REGISTRY_IMAGE${tag}-debian" .
+    - docker push "$CI_REGISTRY_IMAGE${tag}-debian"
   rules:
     - if: $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_BRANCH == 'dev'
       exists:
-        - Dockerfile.alpine
+        - Dockerfile.debian
diff --git a/Dockerfile b/Dockerfile
index 931c938..980f2a6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -44,7 +44,7 @@ RUN git clone https://git.n64.cc/nosial/ncc.git;
 # Main stage: Copies downloaded files and installs all
 #
 
-FROM php:8.1-fpm
+FROM php:8.1-fpm-alpine
 
 # Add extensions
 ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
@@ -57,8 +57,8 @@ RUN install-php-extensions mbstring     \
                            ctype        \
                            common;                                              \
     
-    # Add git
-    apt install -y git;                                                         \
+    # Add git and tar
+    apk add git tar;                                                            \
     
     # Install phive, phab and ncc; create workdir
     chmod +x phive.phar;                                                        \
diff --git a/Dockerfile.alpine b/Dockerfile.debian
similarity index 96%
rename from Dockerfile.alpine
rename to Dockerfile.debian
index 980f2a6..931c938 100644
--- a/Dockerfile.alpine
+++ b/Dockerfile.debian
@@ -44,7 +44,7 @@ RUN git clone https://git.n64.cc/nosial/ncc.git;
 # Main stage: Copies downloaded files and installs all
 #
 
-FROM php:8.1-fpm-alpine
+FROM php:8.1-fpm
 
 # Add extensions
 ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
@@ -57,8 +57,8 @@ RUN install-php-extensions mbstring     \
                            ctype        \
                            common;                                              \
     
-    # Add git and tar
-    apk add git tar;                                                            \
+    # Add git
+    apt install -y git;                                                         \
     
     # Install phive, phab and ncc; create workdir
     chmod +x phive.phar;                                                        \