diff --git a/CICD/heat/gc_secgroups.hot b/CICD/heat/gc_secgroups.hot
index ad6e779035e99df7fd93639f2a0179848cc69a5e..fe7d4b35f50549c7e81f7f65fc6d73ff0e9fd0f7 100644
--- a/CICD/heat/gc_secgroups.hot
+++ b/CICD/heat/gc_secgroups.hot
@@ -10,13 +10,16 @@ resources:
      name: "heatslurmsecgroup"
      rules: [ { protocol: tcp,
                port_range_min: 12000,
-               port_range_max: 12999},
+               port_range_max: 12999,
+               remote_mode: "remote_group_id"},
               { protocol: tcp,
                port_range_min: 6817,
-               port_range_max: 6819},
+               port_range_max: 6819,
+               remote_mode: "remote_group_id"},
               { protocol: tcp,
                port_range_min: 1019,
-               port_range_max: 1019}]
+               port_range_max: 1019,
+               remote_mode: "remote_group_id"}]
   NFSSecGroup:
    type: "OS::Neutron::SecurityGroup"
    properties:
diff --git a/roles/slurm-common/tasks/createSlurmDirectories.yml b/roles/slurm-common/tasks/createSlurmDirectories.yml
index 738956823167ca062efe85940774a45c9a547423..ba82cd78ea1dae229ba95a63a2f03a1131e7ec29 100644
--- a/roles/slurm-common/tasks/createSlurmDirectories.yml
+++ b/roles/slurm-common/tasks/createSlurmDirectories.yml
@@ -42,7 +42,6 @@
 - name: create shared state directory
   file: path={{slurmsharedstatedir }} state=directory owner=slurm group=slurm mode=750
   become: true
-  run_once: true
   when: usesharedstatedir is defined and usesharedstatedir
 
 - name: symlink shared state dir
diff --git a/roles/slurm-start/tasks/main.yml b/roles/slurm-start/tasks/main.yml
index c30074e72da0573c4443be01495705abb46fc4d1..678de3d57fe8d786c4bc90c45b2adf5f35016513 100644
--- a/roles/slurm-start/tasks/main.yml
+++ b/roles/slurm-start/tasks/main.yml
@@ -60,6 +60,7 @@
   shell:  "{{slurm_dir}}/bin/sacctmgr show cluster -p | wc -l"
   register: slurm_cluster_count
   check_mode: no
+  changed_when: false
 
 - debug:
     var: slurm_cluster_count