diff --git a/assets/runtime/functions b/assets/runtime/functions
index e8bfa43b..eaf34a2b 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -940,68 +940,81 @@ gitlab_configure_ci() {
 }
 
 gitlab_configure_artifacts() {
+  if [[ ${GITLAB_ARTIFACTS_OBJECT_STORE_ENABLED} == true ]]; then
+    echo "Configuring gitlab::artifacts:object_store"
+    update_template ${GITLAB_CONFIG} \
+      GITLAB_ARTIFACTS_OBJECT_STORE_ENABLED \
+      GITLAB_ARTIFACTS_OBJECT_STORE_REMOTE_DIRECTORY \
+      GITLAB_ARTIFACTS_OBJECT_STORE_BACKGROUND_UPLOAD \
+      GITLAB_ARTIFACTS_OBJECT_STORE_PROXY_DOWNLOAD \
+      GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_PROVIDER \
+      GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID \
+      GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY \
+      GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_REGION \
+      GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_HOST \
+      GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT \
+      GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE
+  else 
+   exec_as_git sed -i -e "/path: {{GITLAB_ARTIFACTS_DIR}}/{n;N;N;N;N;N;N;N;N;N;N;N;N;d;}" ${GITLAB_CONFIG}
+  fi
+
   echo "Configuring gitlab::artifacts..."
   update_template ${GITLAB_CONFIG} \
     GITLAB_ARTIFACTS_ENABLED \
     GITLAB_ARTIFACTS_DIR
-
-  echo "Configuring gitlab::artifacts:object_store"
-  update_template ${GITLAB_CONFIG} \
-    GITLAB_ARTIFACTS_OBJECT_STORE_ENABLED \
-    GITLAB_ARTIFACTS_OBJECT_STORE_REMOTE_DIRECTORY \
-    GITLAB_ARTIFACTS_OBJECT_STORE_BACKGROUND_UPLOAD \
-    GITLAB_ARTIFACTS_OBJECT_STORE_PROXY_DOWNLOAD \
-    GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_PROVIDER \
-    GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID \
-    GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY \
-    GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_REGION \
-    GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_HOST \
-    GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT \
-    GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE
 }
 
 gitlab_configure_lfs() {
+  if [[ ${GITLAB_LFS_OBJECT_STORE_ENABLED} == true ]]; then
+    echo "Configuring gitlab::lfs:object_store"
+    update_template ${GITLAB_CONFIG} \
+      GITLAB_LFS_OBJECT_STORE_ENABLED \
+      GITLAB_LFS_OBJECT_STORE_REMOTE_DIRECTORY \
+      GITLAB_LFS_OBJECT_STORE_DIRECT_UPLOAD \
+      GITLAB_LFS_OBJECT_STORE_BACKGROUND_UPLOAD \
+      GITLAB_LFS_OBJECT_STORE_PROXY_DOWNLOAD \
+      GITLAB_LFS_OBJECT_STORE_CONNECTION_PROVIDER \
+      GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID \
+      GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY \
+      GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_REGION \
+      GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_HOST \
+      GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT \
+      GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE
+  else 
+    exec_as_git sed -i -e "/path: {{GITLAB_LFS_OBJECTS_DIR}}/{n;N;N;N;N;N;N;N;N;N;N;N;N;N;d;}"  ${GITLAB_CONFIG}
+  fi
+
   echo "Configuring gitlab::lfs..."
   update_template ${GITLAB_CONFIG} \
     GITLAB_LFS_ENABLED \
     GITLAB_LFS_OBJECTS_DIR
-
-  echo "Configuring gitlab::lfs:object_store"
-  update_template ${GITLAB_CONFIG} \
-    GITLAB_LFS_OBJECT_STORE_ENABLED \
-    GITLAB_LFS_OBJECT_STORE_REMOTE_DIRECTORY \
-    GITLAB_LFS_OBJECT_STORE_DIRECT_UPLOAD \
-    GITLAB_LFS_OBJECT_STORE_BACKGROUND_UPLOAD \
-    GITLAB_LFS_OBJECT_STORE_PROXY_DOWNLOAD \
-    GITLAB_LFS_OBJECT_STORE_CONNECTION_PROVIDER \
-    GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID \
-    GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY \
-    GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_REGION \
-    GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_HOST \
-    GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT \
-    GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE
 }
 
 gitlab_configure_uploads() {
+  if [[ ${GITLAB_UPLOADS_OBJECT_STORE_ENABLED} == true ]]; then
+    echo "Configuring gitlab::uploads:object_store"
+    update_template ${GITLAB_CONFIG} \
+      GITLAB_UPLOADS_OBJECT_STORE_ENABLED \
+      GITLAB_UPLOADS_OBJECT_STORE_REMOTE_DIRECTORY \
+      GITLAB_UPLOADS_OBJECT_STORE_DIRECT_UPLOAD \
+      GITLAB_UPLOADS_OBJECT_STORE_BACKGROUND_UPLOAD \
+      GITLAB_UPLOADS_OBJECT_STORE_PROXY_DOWNLOAD \
+      GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_PROVIDER \
+      GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID \
+      GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY \
+      GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_REGION \
+      GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_HOST \
+      GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT \
+      GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE
+  else 
+   exec_as_git sed -i -e "/base_dir: {{GITLAB_UPLOADS_BASE_DIR}}/{n;N;N;N;N;N;N;N;N;N;N;N;N;N;d;}"  ${GITLAB_CONFIG}
+  fi
+
   echo "Configuring gitlab::uploads..."
   update_template ${GITLAB_CONFIG} \
     GITLAB_UPLOADS_STORAGE_PATH \
     GITLAB_UPLOADS_BASE_DIR
 
-  echo "Configuring gitlab::uploads:object_store"
-  update_template ${GITLAB_CONFIG} \
-    GITLAB_UPLOADS_OBJECT_STORE_ENABLED \
-    GITLAB_UPLOADS_OBJECT_STORE_REMOTE_DIRECTORY \
-    GITLAB_UPLOADS_OBJECT_STORE_DIRECT_UPLOAD \
-    GITLAB_UPLOADS_OBJECT_STORE_BACKGROUND_UPLOAD \
-    GITLAB_UPLOADS_OBJECT_STORE_PROXY_DOWNLOAD \
-    GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_PROVIDER \
-    GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID \
-    GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY \
-    GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_REGION \
-    GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_HOST \
-    GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT \
-    GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE
 }
   
 }