diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c3d2fcd..ed35034 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -103,7 +103,7 @@ PyLint:
 gilab-ci.yml Lint (python 3.6):
     variables:
         YAML_LINT_PATH: ".gitlab-ci* ./**/.gitlab-ci*"
-        YAML_LINT_EXTRA_ARGS: '-d "{ extends: $ROOT_DIR/yaml_lint/.yamllint.yaml, ignore: [website-template/*] }"'
+        YAML_LINT_EXTRA_ARGS: "{ extends: yaml_lint/.yamllint.yaml, ignore: [website-template/*] }"
     extends:
         - .yaml_lint_defaults
     image: python:3.6-slim
diff --git a/yaml_lint/.gitlab-ci.yml b/yaml_lint/.gitlab-ci.yml
index c2af611..4640730 100644
--- a/yaml_lint/.gitlab-ci.yml
+++ b/yaml_lint/.gitlab-ci.yml
@@ -2,8 +2,7 @@
 .yaml_lint_defaults:
     variables:
         YAML_LINT_PATH: "."
-        YAML_LINT_CONFIG: "/yaml_lint/.yamllint.yaml"
-        YAML_LINT_EXTRA_ARGS: '-d "{ extends: $ROOT_DIR/yaml_lint/.yamllint.yaml, ignore: [gitlab-ci/*] }"'
+        YAML_LINT_EXTRA_ARGS: "{ extends: $ROOT_DIR/yaml_lint/.yamllint.yaml, ignore: [gitlab-ci/*] }"
     stage: validation
     before_script:
         - if [ "0$JOB_ROOT_DIR" == "0" ]; then ROOT_DIR=gitlab-ci; else ROOT_DIR=$JOB_ROOT_DIR ; fi
@@ -23,7 +22,7 @@
         - echo "[DEBUG] YAML_LINT_PATH[$YAML_LINT_PATH]"
         - YAML_LINT_CONFIG=$ROOT_DIR$YAML_LINT_CONFIG
         - echo "[DEBUG] YAML_LINT_CONFIG[$YAML_LINT_CONFIG]"
-        - yamllint $YAML_LINT_PATH -f parsable $YAML_LINT_EXTRA_ARGS > "$CI_PROJECT_DIR/artifacts/$CI_JOB_STAGE/$CI_JOB_NAME/$PYTHON_VERSION-yaml-lint.log" 1>&1 || YAML_LINT=$?
+        - yamllint $YAML_LINT_PATH -f parsable -d "$(echo $YAML_LINT_EXTRA_ARGS)" > "$CI_PROJECT_DIR/artifacts/$CI_JOB_STAGE/$CI_JOB_NAME/$PYTHON_VERSION-yaml-lint.log" 1>&1 || YAML_LINT=$?
         - cat "$CI_PROJECT_DIR/artifacts/$CI_JOB_STAGE/$CI_JOB_NAME/$PYTHON_VERSION-yaml-lint.log" | ansible-lint-to-junit-xml > "$CI_PROJECT_DIR/artifacts/$CI_JOB_STAGE/tests/$PYTHON_VERSION-yaml-lint.junit.xml"
         - if [ $YAML_LINT > 0 ]; then echo "YAML lint failed with $YAML_LINT"; exit $YAML_LINT; fi
     after_script: