diff --git a/config.cfg b/config.cfg
index af31bb7..9ac69db 100644
--- a/config.cfg
+++ b/config.cfg
@@ -67,23 +67,20 @@ CA_PayloadIdentifier: "{{ 700000 | random | to_uuid | upper }}"
 
 BetweenClients_DROP: Y
 
-congrats: |
-  "#----------------------------------------------------------------------#"
-  "#                          Congratulations!                            #"
-  "#                     Your Algo server is running.                     #"
-  "#    Config files and certificates are in the ./configs/ directory.    #"
-  "#              Go to https://whoer.net/ after connecting               #"
-  "#        and ensure that all your traffic passes through the VPN.      #"
-  "#          Local DNS resolver and Proxy IP address: {{ local_service_ip }}         #"
-  "#                The p12 and SSH keys password is {{ easyrsa_p12_export_password }}             #"
-  "#                  The CA key password is {{ easyrsa_CA_password }}                 #"
-  "#----------------------------------------------------------------------#"
-
-additional_information: |
-  "#----------------------------------------------------------------------#"
-  "#      Shell access: ssh -i {{ ansible_ssh_private_key_file }} {{ ansible_ssh_user }}@{{ ansible_ssh_host }}        #"
-  "#----------------------------------------------------------------------#"
-
+congrats:
+  common: |
+    "#                          Congratulations!                            #"
+    "#                     Your Algo server is running.                     #"
+    "#    Config files and certificates are in the ./configs/ directory.    #"
+    "#              Go to https://whoer.net/ after connecting               #"
+    "#        and ensure that all your traffic passes through the VPN.      #"
+    "#          Local DNS resolver and Proxy IP address: {{ local_service_ip }}         #"
+  p12_pass: |
+    "#                The p12 and SSH keys password is {{ easyrsa_p12_export_password }}             #"
+  ca_key_pass: |
+    "#                  The CA key password is {{ easyrsa_CA_password }}                 #"
+  ssh_access: |
+    "#      Shell access: ssh -i {{ ansible_ssh_private_key_file|default(omit) }} {{ ansible_ssh_user|default(omit) }}@{{ ansible_ssh_host|default(omit) }}        #"
 
 SSH_keys:
   comment: algo@ssh
diff --git a/deploy.yml b/deploy.yml
index 94a6c3d..75aac5e 100644
--- a/deploy.yml
+++ b/deploy.yml
@@ -49,6 +49,10 @@
       include: playbooks/common.yml
       tags: [ 'digitalocean', 'ec2', 'gce', 'azure', 'local', 'pre' ]
 
+    - set_fact:
+        cloud_deployment: true
+      tags: ['cloud']
+
   roles:
     - { role: security, tags: [ 'security' ] }
     - { role: proxy, tags: [ 'proxy', 'adblock' ] }
@@ -58,12 +62,14 @@
     - { role: vpn, tags: [ 'vpn' ] }
 
   post_tasks:
-    - debug: msg="{{ congrats.split('\n') }}"
+    - debug:
+        msg:
+          - "{{ congrats.common.split('\n') }}"
+          - "    {{ congrats.p12_pass }}"
+          - "    {% if Store_CAKEY is defined and Store_CAKEY == 'N' %}{% else %}{{ congrats.ca_key_pass }}{% endif %}"
+          - "    {% if cloud_deployment is defined %}{{ congrats.ssh_access }}{% endif %}"
       tags: always
 
-    - debug: msg="{{ additional_information.split('\n') }}"
-      tags: cloud
-
     - name: Save the CA key password
       local_action: >
         shell echo "{{ easyrsa_CA_password }}" > /tmp/ca_password