diff --git a/homelab/server/config/gitlab/docker-compose.yml b/homelab/server/config/gitlab/docker-compose.yml
index b26f62f4..2417f902 100644
--- a/homelab/server/config/gitlab/docker-compose.yml
+++ b/homelab/server/config/gitlab/docker-compose.yml
@@ -15,6 +15,8 @@ services:
     hostname: 'gitlab.jafner.net'
     networks:
       - web
+    env_file:
+      - gitlab.env
     environment:
       GITLAB_OMNIBUS_CONFIG: |
         external_url 'https://gitlab.jafner.net'
@@ -103,8 +105,9 @@ services:
         loki-timeout: "2s"
         keep-file: "true"
     restart: "no"
-    environment:
-      - GODEBUG="x509ignoreCN=0"
+    env_file:
+      - gitlab.env
+      - runner.env
     volumes:
       - ${DOCKER_DATA}/runner-config:/etc/gitlab-runner
       - /var/run/docker.sock:/var/run/docker.sock
@@ -123,8 +126,9 @@ services:
         loki-timeout: "2s"
         keep-file: "true"
     restart: "no"
-    environment:
-      - GODEBUG="x509ignoreCN=0"
+    env_file:
+      - gitlab.env
+      - runner.env
     volumes:
       - ${DOCKER_DATA}/runner-config:/etc/gitlab-runner
       - /var/run/docker.sock:/var/run/docker.sock
diff --git a/homelab/server/config/gitlab/.env b/homelab/server/config/gitlab/gitlab.env
similarity index 88%
rename from homelab/server/config/gitlab/.env
rename to homelab/server/config/gitlab/gitlab.env
index 96d7bf54..63060ddd 100644
--- a/homelab/server/config/gitlab/.env
+++ b/homelab/server/config/gitlab/gitlab.env
@@ -1,2 +1,3 @@
+# Volumes
 DOCKER_DATA=/home/joey/data/gitlab
 DOCKER_CONFIG=/home/joey/docker_config/gitlab
\ No newline at end of file
diff --git a/homelab/server/config/gitlab/project.env b/homelab/server/config/gitlab/project.env
deleted file mode 100644
index e69de29b..00000000
diff --git a/homelab/server/config/gitlab/runner.env b/homelab/server/config/gitlab/runner.env
new file mode 100644
index 00000000..b3d0e431
--- /dev/null
+++ b/homelab/server/config/gitlab/runner.env
@@ -0,0 +1 @@
+GODEBUG="x509ignoreCN=0"
\ No newline at end of file