diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7dcaf8f..5119c32 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,7 +26,7 @@ include:
 variables:
   JOB_ROOT_DIR: '.'
   SECURE_LOG_LEVEL: debug
-  GIT_SUBMODULE_STRATEGY: recursive
+  GIT_SUBMODULE_STRATEGY: normal
   GIT_SYNC_URL: "https://$GITHUB_USERNAME_ROBOT:$GITHUB_TOKEN_ROBOT@github.com/NoFussComputing/gitlab-ci.git"
   MY_PROJECT_ID: "28543717"
   LICENSE_FINDER_CLI_OPTS: '--recursive'
diff --git a/.gitlab-ci_common.yaml b/.gitlab-ci_common.yaml
index f8c0748..82d8311 100644
--- a/.gitlab-ci_common.yaml
+++ b/.gitlab-ci_common.yaml
@@ -1,6 +1,6 @@
 variables:
     JOB_ROOT_DIR: 'gitlab-ci'
-    GIT_SUBMODULE_STRATEGY: recursive
+    GIT_SUBMODULE_STRATEGY: normal
     #PIPELINE_RUN_TRIGGER: 'false'
     PIPELINE_RUN_SCHEDULE: 'true'
 
diff --git a/docker/build.gitlab-ci.yaml b/docker/build.gitlab-ci.yaml
index 723a192..00f381b 100644
--- a/docker/build.gitlab-ci.yaml
+++ b/docker/build.gitlab-ci.yaml
@@ -111,7 +111,7 @@ variables:
         - '{dockerfile, dockerfile.j2}'
       changes:
         paths:
-          - '{dockerfile, dockerfile.j2, includes**/**}'
+          - '{dockerfile, dockerfile.j2, includes/**}'
         compare_to: 'master'
       when: always
 
@@ -123,7 +123,7 @@ variables:
         - '{dockerfile, dockerfile.j2}'
       changes:
         paths:
-          - '{dockerfile, dockerfile.j2, includes**/**}'
+          - '{dockerfile, dockerfile.j2, includes/**}'
         compare_to: 'development'
       when: always
 
diff --git a/docker/publish.gitlab-ci.yaml b/docker/publish.gitlab-ci.yaml
index 986e1b4..c9a7915 100644
--- a/docker/publish.gitlab-ci.yaml
+++ b/docker/publish.gitlab-ci.yaml
@@ -116,7 +116,7 @@
         - '{dockerfile, dockerfile.j2}'
       changes:
         paths:
-          - '{dockerfile, dockerfile.j2, includes**/**}'
+          - '{dockerfile, dockerfile.j2, includes/**}'
         compare_to: 'master'
       allow_failure: true
       when: manual
diff --git a/gitlab_release/.gitlab-ci.yml b/gitlab_release/.gitlab-ci.yml
index cad7b3c..6a26df1 100644
--- a/gitlab_release/.gitlab-ci.yml
+++ b/gitlab_release/.gitlab-ci.yml
@@ -112,9 +112,14 @@ commit footer refs:
         - if: # condition_not_master_or_dev_push
             $CI_COMMIT_BRANCH != "master" && 
             $CI_COMMIT_BRANCH != "development" && 
-            $CI_PIPELINE_SOURCE == "push"
+            $CI_PIPELINE_SOURCE == "push" &&
+            $CI_COMMIT_TAG == null
           exists:
           - .cz.yaml
+          changes: 
+            paths:
+              - "**/**"
+            compare_to: development
           when: always
 
         - when: never
diff --git a/lint/ansible.gitlab-ci.yaml b/lint/ansible.gitlab-ci.yaml
index a9f5554..b671395 100644
--- a/lint/ansible.gitlab-ci.yaml
+++ b/lint/ansible.gitlab-ci.yaml
@@ -41,17 +41,17 @@
         $CI_COMMIT_BRANCH == "master" && 
         $CI_PIPELINE_SOURCE == "push"
       exists:
-        - '{defaults/**,handlers/**,meta/**,tasks/**}/*.yaml'
+        - '{defaults/**, handlers/**, inventory/**, meta/**, playbooks/**. tasks/**}/*.{yaml,yml}'
       when: always
 
     - if: # condition_dev_branch_push
         $CI_COMMIT_BRANCH == "development" && 
         $CI_PIPELINE_SOURCE == "push"
       exists:
-        - '{defaults/**,handlers/**,meta/**,tasks/**}/*.yaml'
+        - '{defaults/**, handlers/**, inventory/**, meta/**, playbooks/**. tasks/**}/*.{yaml,yml}'
       changes:
         paths:
-          - '{defaults/**,handlers/**,meta/**,tasks/**}/*.yaml'
+          - '{defaults/**, handlers/**, inventory/**, meta/**, playbooks/**. tasks/**}/*.{yaml,yml}'
         compare_to: 'master'
       when: always
 
@@ -60,10 +60,10 @@
         $CI_COMMIT_BRANCH != "development" && 
         $CI_PIPELINE_SOURCE == "push"
       exists:
-        - '{defaults/**,handlers/**,meta/**,tasks/**}/*.yaml'
+        - '{defaults/**, handlers/**, inventory/**, meta/**, playbooks/**. tasks/**}/*.{yaml,yml}'
       changes:
         paths:
-          - '{defaults/**,handlers/**,meta/**,tasks/**}/*.yaml'
+          - '{defaults/**, handlers/**, inventory/**, meta/**, playbooks/**. tasks/**}/*.{yaml,yml}'
         compare_to: 'development'
       when: always