diff --git a/roles/aws/aws_backup_validation/defaults/main.yml b/roles/aws/aws_backup_validation/defaults/main.yml
index d128e7f18..8264ff268 100644
--- a/roles/aws/aws_backup_validation/defaults/main.yml
+++ b/roles/aws/aws_backup_validation/defaults/main.yml
@@ -9,7 +9,7 @@ aws_backup_validation:
   handler: "lambda_handler"
   resources:
     - name: ec2_test_instance
-      git_url: git@gitlab.dummy-infra1.codeenigma.net:functions/ec2_test_instance.git
+      git_url: true
       type: EC2
       lambda_policy:
         - "backup:PutRestoreValidationResult"
@@ -18,7 +18,7 @@ aws_backup_validation:
         - "ssm:SendCommand"
         - "ec2:DescribeInstances"
     - name: rds_test_instance
-      git_url: git@gitlab.dummy-infra1.codeenigma.net:functions/rds_test_instance.git
+      git_url: true
       type:  RDS
       lambda_policy:
         - "backup:PutRestoreValidationResult"
@@ -27,12 +27,12 @@ aws_backup_validation:
         - "ec2:DescribeInstances"
         - "rds:DescribeDBInstances"
     - name: aurora_create_instance
-      git_url: git@gitlab.dummy-infra1.codeenigma.net:functions/aurora_create_instance.git
+      git_url: true
       type: Aurora
       lambda_policy:
         - "lambda:InvokeFunction"
     - name: aurora_test_instance
-      git_url: git@gitlab.dummy-infra1.codeenigma.net:functions/aurora_test_instance.git
+      git_url: true
       type: Aurora
       event_pattern: '{ "source": ["aws.rds"], "detail-type": ["RDS DB Instance Event"], "resources": [{ "prefix": "arn:aws:rds:eu-west-1:{{ _acc_id }}:db:restoretest" }], "detail": { "EventID": ["RDS-EVENT-0005"] } }'
       lambda_policy:
@@ -42,7 +42,7 @@ aws_backup_validation:
         - "rds:DescribeDBClusters"
         - "rds:DeleteDBInstance"
     - name: validation_report
-      git_url: git@gitlab.example.codeenigmma.net:functions/validation_report.git
+      git_url: true
       type: Schedule
       schedule: "cron(0 0 ? * MON *)"
       lambda_policy:
diff --git a/roles/aws/aws_ec2_with_eip/tasks/main.yml b/roles/aws/aws_ec2_with_eip/tasks/main.yml
index 7f13d4d1f..d03ddcc5c 100644
--- a/roles/aws/aws_ec2_with_eip/tasks/main.yml
+++ b/roles/aws/aws_ec2_with_eip/tasks/main.yml
@@ -15,7 +15,7 @@
   ansible.builtin.set_fact:
     _aws_hostname: "{{ item }}"
   with_inventory_hostnames:
-    - "{{ aws_ec2_with_eip.hostname }}"
+    - "_{{ aws_ec2_with_eip.hostname|regex_replace('-', '_') }}"
 
 # Subnet ID is stored in ce-provision's data directory
 - name: Ensure server data directory exists.
@@ -133,7 +133,7 @@
           volume_type: "{{ aws_ec2_with_eip.root_volume_type }}"
           encrypted: "{{ aws_ec2_with_eip.root_volume_encrypted }}"
   register: _aws_ec2_with_eip_instances
-  when: (_aws_hostname | length == 0) or (_aws_hostname == aws_ec2_with_eip.hostname) or aws_ec2_with_eip.force
+  when: (_aws_hostname|length == 0) or aws_ec2_with_eip.force
 
 # This task deliberately omits `image_id` so it cannot create a new instance, only refresh the state of an existing one.
 - name: Refresh EC2 instance.
@@ -159,7 +159,7 @@
           volume_type: "{{ aws_ec2_with_eip.root_volume_type }}"
           encrypted: "{{ aws_ec2_with_eip.root_volume_encrypted }}"
   register: _aws_ec2_with_eip_instances
-  when: (_aws_hostname | length > 0) or (_aws_hostname != aws_ec2_with_eip.hostname) or not aws_ec2_with_eip.force
+  when: (_aws_hostname|length > 0) or not aws_ec2_with_eip.force
 
 - name: Check if we have an existing EIP.
   amazon.aws.ec2_eip_info:
diff --git a/roles/debian/nginx/defaults/main.yml b/roles/debian/nginx/defaults/main.yml
index 38fd8bf1c..274656933 100644
--- a/roles/debian/nginx/defaults/main.yml
+++ b/roles/debian/nginx/defaults/main.yml
@@ -132,6 +132,9 @@ nginx:
   php_fastcgi_backend: "127.0.0.1:90{{ php.version[-1] | replace('.', '') }}" # for unix socket use "unix:/var/run/php{{ php.version[-1] | replace('.','') }}-fpm.sock"
   ratelimitingcrawlers: false
   client_max_body_size: "700M"
+  ssl_ciphers: [] # Defaults to empty list, you can add ciphers if needed
+#   - ECDHE-RSA-AES256-GCM-SHA384
+#   - ECDHE-RSA-CHACHA20-POLY1305
   # drupal_fallback: []
   # Default location behavior for nginx
   # If no custom location behavior is defined, this will be used: