diff --git a/create-remote-database-backup.yml b/create-remote-database-backup.yml
index b50560f..5c40af7 100644
--- a/create-remote-database-backup.yml
+++ b/create-remote-database-backup.yml
@@ -57,7 +57,7 @@
   tasks:
     - name: "Add {{ database_engine }} servers to hosts if necessary"
       add_host:
-        name: "{{shared_service_postgres_secondary }}"
+        name: "{{ shared_service_postgres_secondary }}"
         groups:
         - "stage_{{ stage }}"
         - '{{ database_engine }}'
@@ -116,7 +116,7 @@
       become_user: '{{ storageserver_system_user }}'
       vars:
         # should work with non-fqdn due to existing entry in /etc/hosts
-        database_server_ip: "{{ stage }}-{{ database_engine }}-{{'02' if database_engine == 'postgres' else '01'}}"
+        database_server_ip: "{{ shared_service_postgres_secondary if database_engine == 'postgres' else shared_service_maria_primary }}"
       shell: '/home/{{ storageserver_system_user }}/pull_remote_backups.sh {{ database_server_ip }} {{ stage }} {{ database_engine }}'
       when:
         - inventory_hostname in groups['storage']
diff --git a/roles/maria/tasks/_create_backup.yml b/roles/maria/tasks/_create_backup.yml
index b24503f..10f8f37 100644
--- a/roles/maria/tasks/_create_backup.yml
+++ b/roles/maria/tasks/_create_backup.yml
@@ -48,7 +48,7 @@
   shell: |
       set -o pipefail
       /usr/bin/mariabackup --defaults-file={{ my_cnf_file }} --backup --stream=xbstream | gzip > {{ backup_file }} && \
-      gpg --encrypt --recipient "smardigo automation DEV" --trust-model always {{ backup_file }} && \
+      gpg --encrypt --recipient "{{ backup_gpg_recipient }}" --trust-model always {{ backup_file }} && \
       rm {{ backup_file }}
   args:
     executable: /bin/bash