diff --git a/tasks/main.yml b/tasks/main.yml
index 3b90ce61..d4939e27 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -497,9 +497,10 @@
 
     - name: Create and back up DBM certificate
       vars:
-        __mssql_input_sql_file: create_and_back_up_dbm_cert.j2
+        __mssql_input_sql_file: create_and_back_up_cert.j2
       include_tasks: input_sql_file.yml
 
+    # changed_when: false because the role removes cert files after using them
     - name: Fetch DBM certificates from the primary node to the control node
       fetch:
         src: "{{ item.value}}"
@@ -508,10 +509,11 @@
       with_dict:
         cert: /var/opt/mssql/data/{{ mssql_ha_dbm_cert_name }}.cer
         key: /var/opt/mssql/data/{{ mssql_ha_dbm_cert_name }}.pvk
+      changed_when: false
 
     - name: Create database mirroring endpoints
       vars:
-        __mssql_input_sql_file: create_endpoint.j2
+        __mssql_input_sql_file: configure_endpoint.j2
       include_tasks: input_sql_file.yml
 
     - name: Get mssql-server version to see if WRITE_LEASE_VALIDITY is available
@@ -525,7 +527,7 @@
 
     - name: Create the {{ mssql_ha_ag_name }} availability group
       vars:
-        __mssql_input_sql_file: create_ag.j2
+        __mssql_input_sql_file: configure_ag.j2
       include_tasks: input_sql_file.yml
 
     - name: Grant permissions to the {{ mssql_ha_login }} login
@@ -538,22 +540,24 @@
         __mssql_input_sql_file: replicate_db.j2
       include_tasks: input_sql_file.yml
 
-    # This is required because `any_errors_fatal: true` does not work within blocks
-    # that have the `always` section
+    # This is required because `any_errors_fatal: true` does not work within
+    # blocks that have rescue or always sections
     - name: Set a fact to indicate successfull set up on the primary replica
       delegate_to: localhost
       set_fact:
         __mssql_primary_successfull: true
       run_once: true
-
   rescue:
+    # changed_when: false because this task removes unused remnant of cert files
     - name: Remove DBM certificates from the control node
+      delegate_to: localhost
       file:
         path: "{{ item }}"
         state: absent
       loop:
         - cert
         - key
+      changed_when: false
 
 - name: Configure availability group on replicas
   when:
@@ -612,12 +616,12 @@
 
     - name: Restore DBM certificate
       vars:
-        __mssql_input_sql_file: restore_dbm_cert.j2
+        __mssql_input_sql_file: restore_cert.j2
       include_tasks: input_sql_file.yml
 
     - name: Create database mirroring endpoints
       vars:
-        __mssql_input_sql_file: create_endpoint.j2
+        __mssql_input_sql_file: configure_endpoint.j2
       include_tasks: input_sql_file.yml
 
     - name: Create the {{ mssql_ha_login }} login
@@ -640,15 +644,26 @@
         __mssql_input_sql_file: verify_sql_cluster.j2
       include_tasks: input_sql_file.yml
       when: mssql_ha_replica_type != 'witness'
-
   always:
+    # changed_when: false because this task removes unused remnant of cert files
     - name: Remove DBM certificates from the control node
+      delegate_to: localhost
       file:
         path: "{{ item }}"
         state: absent
       loop:
         - cert
         - key
+      changed_when: false
+
+- name: Remove replicas from an availability group
+  when:
+    - mssql_ha_configure is defined
+    - mssql_ha_configure | bool
+    - mssql_ha_replica_type == 'absent'
+  vars:
+    __mssql_input_sql_file: remove_from_ag.j2
+  include_tasks: input_sql_file.yml
 
 - name: Ensure the ansible_managed header in /var/opt/mssql/mssql.conf
   vars:
diff --git a/templates/create_ag.j2 b/templates/configure_ag.j2
similarity index 88%
rename from templates/create_ag.j2
rename to templates/configure_ag.j2
index ddf3bf88..8c8ca353 100644
--- a/templates/create_ag.j2
+++ b/templates/configure_ag.j2
@@ -1,10 +1,57 @@
-IF EXISTS (
+IF NOT EXISTS (
   SELECT * FROM sys.availability_groups
   WHERE name = '{{ mssql_ha_ag_name }}' AND
         cluster_type_desc = 'external'
 )
+BEGIN
+  PRINT 'Creating the {{ mssql_ha_ag_name }} availability group';
+  CREATE AVAILABILITY GROUP {{ mssql_ha_ag_name }}
+{% if ansible_os_family == 'RedHat' and
+  ansible_distribution_version | float < 8.3 %}
+    WITH (DB_FAILOVER = ON, CLUSTER_TYPE = EXTERNAL)
+{% else %}
+    WITH (DB_FAILOVER = ON, CLUSTER_TYPE = EXTERNAL, WRITE_LEASE_VALIDITY=20)
+{% endif %}
+    FOR REPLICA ON
+      N'{{ ansible_hostname }}' WITH (
+        ENDPOINT_URL = N'tcp://{{ ansible_fqdn }}:{{ mssql_ha_listener_port }}',
+        AVAILABILITY_MODE = SYNCHRONOUS_COMMIT,
+        FAILOVER_MODE = EXTERNAL,
+        SEEDING_MODE = AUTOMATIC
+{% for item in ansible_play_hosts %}
+{%   if hostvars[item]['mssql_ha_replica_type'] == 'synchronous' %}
+      ),
+      N'{{ hostvars[item]['ansible_hostname'] }}' WITH (
+        ENDPOINT_URL = N'tcp://{{
+          hostvars[item]['ansible_fqdn'] }}:{{ mssql_ha_listener_port }}',
+        AVAILABILITY_MODE = {{ hostvars[item]['__mssql_ha_availability_mode'] }},
+        FAILOVER_MODE = {{ hostvars[item]['__mssql_ha_failover_mode'] }},
+        SEEDING_MODE = {{ hostvars[item]['__mssql_ha_seeding_mode'] }}
+{%   elif hostvars[item]['mssql_ha_replica_type'] == 'witness' %}
+      ),
+      N'{{ hostvars[item]['ansible_hostname'] }}' WITH (
+        ENDPOINT_URL = N'tcp://{{
+          hostvars[item]['ansible_fqdn'] }}:{{ mssql_ha_listener_port }}',
+        AVAILABILITY_MODE = {{ hostvars[item]['__mssql_ha_availability_mode'] }}
+{%   endif %}
+{% endfor %}
+      );
+  PRINT 'The {{ mssql_ha_ag_name }} availability group created successfully';
+END
+ELSE
 BEGIN
   PRINT 'Verifying the existing availability group {{ mssql_ha_ag_name }}'
+  IF EXISTS (
+    SELECT * FROM sys.availability_groups
+    WHERE name = '{{ mssql_ha_ag_name }}' AND
+          cluster_type_desc != 'external'
+  )
+  BEGIN
+    PRINT 'The existing {{ mssql_ha_ag_name }} availability group has \
+incorrect cluster type set, dropping the groupt to re-create it';
+    DROP AVAILABILITY GROUP ag1;
+    PRINT 'The {{ mssql_ha_ag_name }} availability group dropped successfully';
+  END
   IF NOT EXISTS (
     SELECT * FROM sys.availability_groups
     WHERE name = '{{ mssql_ha_ag_name }}' AND
@@ -19,12 +66,50 @@ BEGIN
     PRINT 'DB_FAILOVER = ON is already set, skipping'
   END
   PRINT 'Verifying replicas'
-{% for item in ansible_play_hosts_all %}
+{% for item in ansible_play_hosts %}
 {%   if hostvars[item]['mssql_ha_replica_type'] != 'absent' %}
   IF EXISTS (
+    SELECT * FROM sys.availability_replicas
+    WHERE replica_server_name = '{{ hostvars[item]['ansible_hostname'] }}' AND
+          availability_mode_desc !=
+            '{{ hostvars[item]['__mssql_ha_availability_mode'] }}'
+  )
+  BEGIN
+    PRINT '{{ hostvars[item]['ansible_hostname'] }}: The availability mode \
+of this availability replica does not match the required availability mode, \
+removing this replica re-create it';
+    ALTER AVAILABILITY GROUP {{ mssql_ha_ag_name }} REMOVE REPLICA ON
+      N'{{ hostvars[item]['ansible_hostname'] }}'
+    PRINT '{{ hostvars[item]['ansible_hostname'] }}: Removed successfully'
+  END
+  IF NOT EXISTS (
     SELECT * FROM sys.availability_replicas
     WHERE replica_server_name = '{{ hostvars[item]['ansible_hostname'] }}'
   )
+  BEGIN
+    PRINT 'Adding the {{ hostvars[item]['ansible_hostname'] }} \
+{{ hostvars[item]['mssql_ha_replica_type'] }} replica';
+{%       if hostvars[item]['mssql_ha_replica_type'] == 'synchronous' %}
+    ALTER AVAILABILITY GROUP {{ mssql_ha_ag_name }} ADD REPLICA ON
+      N'{{ hostvars[item]['ansible_hostname'] }}' WITH (
+        ENDPOINT_URL = N'tcp://{{
+          hostvars[item]['ansible_fqdn'] }}:{{ mssql_ha_listener_port }}',
+        AVAILABILITY_MODE = {{ hostvars[item]['__mssql_ha_availability_mode'] }},
+        FAILOVER_MODE = {{ hostvars[item]['__mssql_ha_failover_mode'] }},
+        SEEDING_MODE = {{ hostvars[item]['__mssql_ha_seeding_mode'] }}
+      );
+{%       elif hostvars[item]['mssql_ha_replica_type'] == 'witness' %}
+    ALTER AVAILABILITY GROUP {{ mssql_ha_ag_name }} ADD REPLICA ON
+      N'{{ hostvars[item]['ansible_hostname'] }}' WITH (
+        ENDPOINT_URL = N'tcp://{{ hostvars[item]['ansible_fqdn'] }}:{{ mssql_ha_listener_port }}',
+        AVAILABILITY_MODE = {{ hostvars[item]['__mssql_ha_availability_mode'] }}
+      );
+{%       endif %}
+    PRINT 'The {{ hostvars[item]['ansible_hostname'] }} \
+{{ hostvars[item]['mssql_ha_replica_type'] }} replica added successfully';
+  END
+{%     if hostvars[item]['mssql_ha_replica_type'] != 'primary' %}
+  ELSE
   BEGIN
     PRINT 'Verifying the existing replica {{ item }}';
 {%     if (hostvars[item]['mssql_ha_replica_type'] == 'primary') or
@@ -57,7 +142,8 @@ BEGIN
 {%     for key, value in ag_replica_settings.items() %}
     IF NOT EXISTS (
       SELECT * FROM sys.availability_replicas
-      WHERE replica_server_name = N'{{ hostvars[item]['ansible_hostname'] }}' AND
+      WHERE replica_server_name = N'{{ hostvars[item]['ansible_hostname'] }}'
+      AND
 {%       if key == 'endpoint_url' %}
             {{ value.sys_setting_name }} = {{ value.setting_value }}
 {%       else %}
@@ -82,95 +168,25 @@ correctly, skipping';
     END
 {%     endfor %}
   END
-{%     if hostvars[item]['mssql_ha_replica_type'] != 'primary' %}
-  ELSE
-  BEGIN
-    PRINT 'Adding the {{ hostvars[item]['ansible_hostname'] }} \
-{{ hostvars[item]['mssql_ha_replica_type'] }} replica';
-{%       if hostvars[item]['mssql_ha_replica_type'] == 'synchronous' %}
-    ALTER AVAILABILITY GROUP {{ mssql_ha_ag_name }} ADD REPLICA ON
-      N'{{ hostvars[item]['ansible_hostname'] }}' WITH (
-        ENDPOINT_URL = N'tcp://{{
-          hostvars[item]['ansible_fqdn'] }}:{{ mssql_ha_listener_port }}',
-        AVAILABILITY_MODE = {{ hostvars[item]['__mssql_ha_availability_mode'] }},
-        FAILOVER_MODE = {{ hostvars[item]['__mssql_ha_failover_mode'] }},
-        SEEDING_MODE = {{ hostvars[item]['__mssql_ha_seeding_mode'] }}
-      );
-{%       elif hostvars[item]['mssql_ha_replica_type'] == 'witness' %}
-    ALTER AVAILABILITY GROUP {{ mssql_ha_ag_name }} ADD REPLICA ON
-      N'{{ hostvars[item]['ansible_hostname'] }}' WITH (
-        ENDPOINT_URL = N'tcp://{{ hostvars[item]['ansible_fqdn'] }}:{{ mssql_ha_listener_port }}',
-        AVAILABILITY_MODE = {{ hostvars[item]['__mssql_ha_availability_mode'] }}
-      );
-{%       endif %}
-    PRINT 'The {{ hostvars[item]['ansible_hostname'] }} \
-{{ hostvars[item]['mssql_ha_replica_type'] }} replica added successfully';
-  END
 {%     endif %}
 {%   elif hostvars[item]['mssql_ha_replica_type'] == 'absent' %}
-  IF EXISTS (
+  IF NOT EXISTS (
     SELECT * FROM sys.availability_replicas
     WHERE replica_server_name = '{{ hostvars[item]['ansible_hostname'] }}'
   )
+  BEGIN
+    PRINT '{{ item }}: this replica is already removed, skipping';
+  END
+  ELSE
   BEGIN
     PRINT '{{ item }}: Removing this replica';
     ALTER AVAILABILITY GROUP {{ mssql_ha_ag_name }}
       REMOVE REPLICA ON N'{{ hostvars[item]['ansible_hostname'] }}';
     PRINT '{{ item }}: This replica is removed successfully';
   END
-  ELSE
-  BEGIN
-    PRINT '{{ item }}: this replica is already removed, skipping';
-  END
 {%   endif %}
 {% endfor %}
 END
-ELSE
-BEGIN
-  IF EXISTS (
-    SELECT * FROM sys.availability_groups
-    WHERE name = '{{ mssql_ha_ag_name }}' AND
-          cluster_type_desc != 'external'
-  )
-  BEGIN
-    PRINT 'The existing {{ mssql_ha_ag_name }} availability group has \
-incorrect cluster type set, dropping the groupt to re-create it';
-    DROP AVAILABILITY GROUP ag1;
-    PRINT 'The {{ mssql_ha_ag_name }} availability group dropped successfully';
-  END
-  PRINT 'Creating the {{ mssql_ha_ag_name }} availability group';
-  CREATE AVAILABILITY GROUP {{ mssql_ha_ag_name }}
-{% if ansible_os_family == 'RedHat' and ansible_distribution_version | float < 8.3 %}
-    WITH (DB_FAILOVER = ON, CLUSTER_TYPE = EXTERNAL)
-{% else %}
-    WITH (DB_FAILOVER = ON, CLUSTER_TYPE = EXTERNAL, WRITE_LEASE_VALIDITY=20)
-{% endif %}
-    FOR REPLICA ON
-      N'{{ ansible_hostname }}' WITH (
-        ENDPOINT_URL = N'tcp://{{ ansible_fqdn }}:{{ mssql_ha_listener_port }}',
-        AVAILABILITY_MODE = SYNCHRONOUS_COMMIT,
-        FAILOVER_MODE = EXTERNAL,
-        SEEDING_MODE = AUTOMATIC
-{% for item in ansible_play_hosts_all %}
-{%   if hostvars[item]['mssql_ha_replica_type'] == 'synchronous' %}
-      ),
-      N'{{ hostvars[item]['ansible_hostname'] }}' WITH (
-        ENDPOINT_URL = N'tcp://{{
-          hostvars[item]['ansible_fqdn'] }}:{{ mssql_ha_listener_port }}',
-        AVAILABILITY_MODE = {{ hostvars[item]['__mssql_ha_availability_mode'] }},
-        FAILOVER_MODE = {{ hostvars[item]['__mssql_ha_failover_mode'] }},
-        SEEDING_MODE = {{ hostvars[item]['__mssql_ha_seeding_mode'] }}
-{%   elif hostvars[item]['mssql_ha_replica_type'] == 'witness' %}
-      ),
-      N'{{ hostvars[item]['ansible_hostname'] }}' WITH (
-        ENDPOINT_URL = N'tcp://{{
-          hostvars[item]['ansible_fqdn'] }}:{{ mssql_ha_listener_port }}',
-        AVAILABILITY_MODE = {{ hostvars[item]['__mssql_ha_availability_mode'] }}
-{%   endif %}
-{% endfor %}
-      );
-  PRINT 'The {{ mssql_ha_ag_name }} availability group created successfully';
-END
 
 -- It is not possible to grant permissions fully idempotently
 ALTER AVAILABILITY GROUP {{ mssql_ha_ag_name }} GRANT CREATE ANY DATABASE;
diff --git a/templates/create_endpoint.j2 b/templates/configure_endpoint.j2
similarity index 99%
rename from templates/create_endpoint.j2
rename to templates/configure_endpoint.j2
index bcafd1ef..051bf386 100644
--- a/templates/create_endpoint.j2
+++ b/templates/configure_endpoint.j2
@@ -102,4 +102,4 @@ endpoint is already correct, skipping';
   BEGIN
     PRINT 'Endpoint {{ mssql_ha_endpoint_name }} is already started, skipping';
   END
-END
\ No newline at end of file
+END
diff --git a/templates/create_and_back_up_dbm_cert.j2 b/templates/create_and_back_up_cert.j2
similarity index 75%
rename from templates/create_and_back_up_dbm_cert.j2
rename to templates/create_and_back_up_cert.j2
index 4e2edfa6..75d8ec20 100644
--- a/templates/create_and_back_up_dbm_cert.j2
+++ b/templates/create_and_back_up_cert.j2
@@ -1,20 +1,27 @@
--- Enabling NOCOUNT to suppress (1 rows affected) messages on the output
+-- Enabling NOCOUNT to suppress (1 rows affected) messages from DECLARE
+-- keywordss on the output
 SET NOCOUNT ON;
 
 DECLARE @cerExists INT;
-exec master.dbo.xp_fileexist '/var/opt/mssql/data/{{ mssql_ha_dbm_cert_name }}.cer', @cerExists OUTPUT;
+exec master.dbo.xp_fileexist
+  '/var/opt/mssql/data/{{ mssql_ha_dbm_cert_name }}.cer', @cerExists OUTPUT;
 DECLARE @pvkExists INT;
-exec master.dbo.xp_fileexist '/var/opt/mssql/data/{{ mssql_ha_dbm_cert_name }}.pvk', @pvkExists OUTPUT;
-IF NOT EXISTS(SELECT * FROM sys.certificates WHERE name = '{{ mssql_ha_dbm_cert_name }}')
+exec master.dbo.xp_fileexist
+  '/var/opt/mssql/data/{{ mssql_ha_dbm_cert_name }}.pvk', @pvkExists OUTPUT;
+IF NOT EXISTS(
+  SELECT *
+  FROM sys.certificates
+  WHERE name = '{{ mssql_ha_dbm_cert_name }}'
+)
 BEGIN
   PRINT 'Certificate {{ mssql_ha_dbm_cert_name }} does not exist, creating';
   IF (@cerExists = 1 AND @pvkExists = 1) OR (@cerExists != @pvkExists)
   BEGIN
-    THROW 51000, 'Certificate {{ mssql_ha_dbm_cert_name }} does not exist in SQL \
-    Server, however, /var/opt/mssql/data/{{ mssql_ha_dbm_cert_name }}.cer and/or \
-    /var/opt/mssql/data/{{ mssql_ha_dbm_cert_name }}.pvk files do exist. You must \
-    either remove the files, or run the role with `mssql_ha_reset_cert: true` \
-    to regenerate certificates.', 1;
+    THROW 51000, 'Certificate {{ mssql_ha_dbm_cert_name }} does not exist in \
+SQL Server, however, /var/opt/mssql/data/{{ mssql_ha_dbm_cert_name }}.cer \
+and/or /var/opt/mssql/data/{{ mssql_ha_dbm_cert_name }}.pvk files do exist. \
+You must either remove the files, or run the role with \
+`mssql_ha_reset_cert: true` to regenerate certificates.', 1;
   END
   ELSE
   BEGIN
diff --git a/templates/create_master_key_encryption.j2 b/templates/create_master_key_encryption.j2
index 2281a4c1..7a629564 100644
--- a/templates/create_master_key_encryption.j2
+++ b/templates/create_master_key_encryption.j2
@@ -4,7 +4,8 @@ IF NOT EXISTS (
 )
 BEGIN
   PRINT 'Master key does not exist, creating';
-  CREATE MASTER KEY ENCRYPTION BY PASSWORD = '{{ mssql_ha_master_key_password }}';
+  CREATE MASTER KEY ENCRYPTION BY PASSWORD =
+    '{{ mssql_ha_master_key_password }}';
   PRINT 'Master key created successfully';
 END
 ELSE
@@ -12,7 +13,8 @@ BEGIN
   PRINT 'Master key already exists, verifying the provided password against \
 the existing master key';
   BEGIN TRY
-    OPEN MASTER KEY DECRYPTION BY PASSWORD = '{{ mssql_ha_master_key_password }}';
+    OPEN MASTER KEY DECRYPTION BY PASSWORD =
+      '{{ mssql_ha_master_key_password }}';
     PRINT 'The provided master key password is correct';
   END TRY
   BEGIN CATCH
@@ -20,4 +22,4 @@ the existing master key';
 mssql_ha_master_key_password variable';
     THROW;
   END CATCH
-END
\ No newline at end of file
+END
diff --git a/templates/enable_alwayson.j2 b/templates/enable_alwayson.j2
index 9cf84d23..bdce2168 100644
--- a/templates/enable_alwayson.j2
+++ b/templates/enable_alwayson.j2
@@ -11,4 +11,4 @@ END
 ELSE
 BEGIN
   PRINT 'AlwaysOn Health events already enabled, skipping';
-END
\ No newline at end of file
+END
diff --git a/templates/grant_permissions_to_ha_login.j2 b/templates/grant_permissions_to_ha_login.j2
index d030f671..c7684d56 100644
--- a/templates/grant_permissions_to_ha_login.j2
+++ b/templates/grant_permissions_to_ha_login.j2
@@ -1,5 +1,7 @@
 -- Need to find how to add permissions idempotently
 PRINT 'Granting the required permissions to {{ mssql_ha_login }}';
-GRANT ALTER, CONTROL, VIEW DEFINITION ON AVAILABILITY GROUP::{{ mssql_ha_ag_name }} TO {{ mssql_ha_login }};
+GRANT ALTER, CONTROL, VIEW DEFINITION ON
+    AVAILABILITY GROUP::{{ mssql_ha_ag_name }}
+    TO {{ mssql_ha_login }};
 GRANT VIEW SERVER STATE TO {{ mssql_ha_login }};
--- PRINT 'Required permissions granted to {{ mssql_ha_login }} successfully';
\ No newline at end of file
+-- PRINT 'Required permissions granted to {{ mssql_ha_login }} successfully';
diff --git a/templates/join_to_ag.j2 b/templates/join_to_ag.j2
index 7d4cfd61..ca0b70ea 100644
--- a/templates/join_to_ag.j2
+++ b/templates/join_to_ag.j2
@@ -1,20 +1,55 @@
-IF NOT EXISTS(
-  SELECT * FROM sys.availability_groups
-  WHERE name = '{{ mssql_ha_ag_name }}' AND
-  cluster_type_desc = 'EXTERNAL'
+IF EXISTS (
+  SELECT *
+  FROM sys.availability_groups
+  WHERE name = '{{ mssql_ha_ag_name }}'
+)
+AND NOT EXISTS (
+  SELECT *
+  FROM sys.availability_groups ag
+  JOIN sys.availability_replicas replica
+  ON ag.group_id = replica.group_id
+  WHERE ag.name = '{{ mssql_ha_ag_name }}' AND
+        replica.replica_server_name = '{{ ansible_hostname }}' AND
+        replica.availability_mode_desc = '{{ __mssql_ha_availability_mode }}'
 )
 BEGIN
-  PRINT 'Joining to the {{ mssql_ha_ag_name }} availability group';
-  ALTER AVAILABILITY GROUP {{ mssql_ha_ag_name }}
-    JOIN WITH (CLUSTER_TYPE = EXTERNAL);
-  PRINT 'Joined to the {{ mssql_ha_ag_name }}  availability group successfully';
+  PRINT 'The existing availability group {{ mssql_ha_ag_name }} has \
+incorrect availability mode set for the {{ ansible_hostname }} replica, \
+removing this availability group to re-create it'
+  DROP AVAILABILITY GROUP {{ mssql_ha_ag_name }};
+  PRINT 'The availability group {{ mssql_ha_ag_name }} removed successfully'
 END
-ELSE
+ELSE IF EXISTS (
+  SELECT *
+  FROM sys.availability_groups
+  WHERE name = '{{ mssql_ha_ag_name }}'
+)
+AND EXISTS (
+  SELECT *
+  FROM sys.availability_groups ag
+  JOIN sys.availability_replicas replica
+  ON ag.group_id = replica.group_id
+  WHERE ag.name = '{{ mssql_ha_ag_name }}' AND
+        replica.replica_server_name = '{{ ansible_hostname }}' AND
+        replica.availability_mode_desc = '{{ __mssql_ha_availability_mode }}'
+)
 BEGIN
   PRINT 'Already joined to the {{ mssql_ha_ag_name }} availability group, \
 skipping'
 END
 
+IF NOT EXISTS(
+  SELECT *
+  FROM sys.availability_groups
+  WHERE name = '{{ mssql_ha_ag_name }}'
+)
+BEGIN
+  PRINT 'Joining to the {{ mssql_ha_ag_name }} availability group';
+  ALTER AVAILABILITY GROUP {{ mssql_ha_ag_name }}
+    JOIN WITH (CLUSTER_TYPE = EXTERNAL);
+  PRINT 'Joined to the {{ mssql_ha_ag_name }} availability group successfully';
+END
+
 {% if mssql_ha_replica_type == 'synchronous' %}
 -- It is not possible to grant permissions fully idempotently
 ALTER AVAILABILITY GROUP {{ mssql_ha_ag_name }} GRANT CREATE ANY DATABASE;
diff --git a/templates/remove_from_ag.j2 b/templates/remove_from_ag.j2
new file mode 100644
index 00000000..6b262304
--- /dev/null
+++ b/templates/remove_from_ag.j2
@@ -0,0 +1,12 @@
+IF EXISTS (
+  SELECT *
+  FROM sys.availability_groups 
+  WHERE name = '{{ mssql_ha_ag_name }}'
+)
+BEGIN
+  PRINT '{{ ansible_hostname }}: Removing from the {{ mssql_ha_ag_name }} \
+availability group'
+  DROP AVAILABILITY GROUP {{ mssql_ha_ag_name }};
+  PRINT '{{ ansible_hostname }}: Removed from the {{ mssql_ha_ag_name }} \
+availability group successfully'
+END
diff --git a/templates/replicate_db.j2 b/templates/replicate_db.j2
index 79ca7883..e892eb47 100644
--- a/templates/replicate_db.j2
+++ b/templates/replicate_db.j2
@@ -50,7 +50,8 @@ IF NOT EXISTS (
   INNER JOIN master.sys.dm_hadr_database_replica_cluster_states AS dbcs
     ON arstates.replica_id = dbcs.replica_id
   LEFT OUTER JOIN master.sys.dm_hadr_database_replica_states AS dbrs
-    ON dbcs.replica_id = dbrs.replica_id AND dbcs.group_database_id = dbrs.group_database_id
+    ON dbcs.replica_id = dbrs.replica_id
+    AND dbcs.group_database_id = dbrs.group_database_id
 )
 BEGIN
   PRINT 'Adding the {{ mssql_ha_db_name }} database to the \
diff --git a/templates/reset_cert.j2 b/templates/reset_cert.j2
new file mode 100644
index 00000000..18e79a3c
--- /dev/null
+++ b/templates/reset_cert.j2
@@ -0,0 +1 @@
+    CREATE CERTIFICATE {{ mssql_ha_dbm_cert_name }} WITH SUBJECT = 'dbm';
diff --git a/templates/restore_dbm_cert.j2 b/templates/restore_cert.j2
similarity index 99%
rename from templates/restore_dbm_cert.j2
rename to templates/restore_cert.j2
index 46eb96cd..dc09c61e 100644
--- a/templates/restore_dbm_cert.j2
+++ b/templates/restore_cert.j2
@@ -14,4 +14,4 @@ END
 ELSE
 BEGIN
   PRINT 'Certificate {{ mssql_ha_dbm_cert_name }} already exists, skipping';
-END
\ No newline at end of file
+END
diff --git a/templates/verify_sql_cluster.j2 b/templates/verify_sql_cluster.j2
index a1bddbe1..1c31bc1b 100644
--- a/templates/verify_sql_cluster.j2
+++ b/templates/verify_sql_cluster.j2
@@ -19,4 +19,4 @@ ELSE
 BEGIN
   PRINT 'Verified that the {{ mssql_ha_db_name }} database exists on this \
 replica';
-END
\ No newline at end of file
+END
diff --git a/vars/main.yml b/vars/main.yml
index 0cf6e8e6..18db524a 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -10,6 +10,8 @@ __mssql_ha_endpoint_role: >-
   ALL
   {%- elif mssql_ha_replica_type == 'witness' -%}
   WITNESS
+  {% else %}
+  null
   {%- endif -%}
 __mssql_ha_endpoint_url: >-
   {{ "N'tcp://" + ansible_fqdn + ":" + mssql_ha_listener_port | string + "'" }}
@@ -18,16 +20,22 @@ __mssql_ha_availability_mode: >-
   SYNCHRONOUS_COMMIT
   {%- elif mssql_ha_replica_type == 'witness' -%}
   CONFIGURATION_ONLY
+  {% else %}
+  null
   {%- endif -%}
 __mssql_ha_failover_mode: >-
   {%- if mssql_ha_replica_type in ['primary', 'synchronous'] -%}
   EXTERNAL
   {%- elif mssql_ha_replica_type == 'witness' -%}
   MANUAL
+  {% else %}
+  null
   {%- endif -%}
 __mssql_ha_seeding_mode: >-
   {%- if mssql_ha_replica_type in ['primary', 'synchronous'] -%}
   AUTOMATIC
   {%- elif mssql_ha_replica_type == 'witness' -%}
   MANUAL
+  {% else %}
+  null
   {%- endif -%}