diff --git a/templates/GitLab-Runner/0/docker-compose.yml b/templates/GitLab-Runner/0/docker-compose.yml
index 8816116..805489c 100644
--- a/templates/GitLab-Runner/0/docker-compose.yml
+++ b/templates/GitLab-Runner/0/docker-compose.yml
@@ -41,7 +41,9 @@ services:
       traefik.enable: false
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
-      - GitLab-Runner:/etc/gitlab-runner
+      - /etc/localtime:/etc/localtime:ro # Syncronize time of container with the host system
+      - /etc/timezone:/etc/timezone:ro # Syncronize timezone of container with the host system
+      - /Persistent/${DATA_DIR}:/etc/gitlab-runner
   gitlab-runner:
     image: gitlab/gitlab-runner:alpine # Alpine Linux image is designed to use only Docker as the method of spawning runners
     command:
@@ -61,8 +63,6 @@ services:
     restart: always
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
-      - GitLab-Runner:/etc/gitlab-runner
-
-volumes:
-  GitLab-Runner:
-    driver: local
\ No newline at end of file
+      - /etc/localtime:/etc/localtime:ro # Syncronize time of container with the host system
+      - /etc/timezone:/etc/timezone:ro # Syncronize timezone of container with the host system
+      - /Persistent/${DATA_DIR}:/etc/gitlab-runner
\ No newline at end of file
diff --git a/templates/GitLab-Runner/0/rancher-compose.yml b/templates/GitLab-Runner/0/rancher-compose.yml
index 8140b66..7c97e45 100644
--- a/templates/GitLab-Runner/0/rancher-compose.yml
+++ b/templates/GitLab-Runner/0/rancher-compose.yml
@@ -64,4 +64,12 @@ catalog:
         (Optional) The local IP address of the GitLab service.
       # default: ""
       required: false
+      type: string
+
+    - variable: "DATA_DIR"
+      label: "Data Directory"
+      description: |
+        The directory to store persistent data for the stack.
+      default: "Personal/GitLab-Runner"
+      required: true
       type: string
\ No newline at end of file