diff --git a/roles/cloud-azure/tasks/venv.yml b/roles/cloud-azure/tasks/venv.yml
index 411566d..fb35433 100644
--- a/roles/cloud-azure/tasks/venv.yml
+++ b/roles/cloud-azure/tasks/venv.yml
@@ -1,6 +1,7 @@
 ---
 - name: Install requirements
   pip:
-    requirements: https://raw.githubusercontent.com/ansible-collections/azure/v3.7.0/requirements-azure.txt
+    requirements: https://raw.githubusercontent.com/ansible-collections/azure/v3.7.0/requirements.txt
     state: latest
     virtualenv_python: python3
+  no_log: true
diff --git a/roles/cloud-ec2/files/stack.yaml b/roles/cloud-ec2/files/stack.yaml
index 90e0cdb..c067175 100644
--- a/roles/cloud-ec2/files/stack.yaml
+++ b/roles/cloud-ec2/files/stack.yaml
@@ -5,10 +5,8 @@ Parameters:
   InstanceTypeParameter:
     Type: String
     Default: t2.micro
-  PublicSSHKeyParameter:
-    Type: String
   ImageIdParameter:
-    Type: String
+    Type: AWS::EC2::Image::Id
   WireGuardPort:
     Type: String
   UseThisElasticIP:
@@ -83,8 +81,6 @@ Resources:
   Route:
     Type: AWS::EC2::Route
     DependsOn:
-      - InternetGateway
-      - RouteTable
       - VPCGatewayAttachment
     Properties:
       RouteTableId: !Ref RouteTable
@@ -94,8 +90,6 @@ Resources:
   RouteIPv6:
     Type: AWS::EC2::Route
     DependsOn:
-      - InternetGateway
-      - RouteTable
       - VPCGatewayAttachment
     Properties:
       RouteTableId: !Ref RouteTable
@@ -105,8 +99,6 @@ Resources:
   SubnetIPv6:
     Type: AWS::EC2::SubnetCidrBlock
     DependsOn:
-      - RouteIPv6
-      - VPC
       - VPCIPv6
     Properties:
       Ipv6CidrBlock:
@@ -118,10 +110,6 @@ Resources:
 
   RouteSubnet:
     Type: "AWS::EC2::SubnetRouteTableAssociation"
-    DependsOn:
-      - RouteTable
-      - Subnet
-      - Route
     Properties:
       RouteTableId: !Ref RouteTable
       SubnetId: !Ref Subnet
@@ -167,8 +155,6 @@ Resources:
     Type: AWS::EC2::Instance
     DependsOn:
       - SubnetIPv6
-      - Subnet
-      - InstanceSecurityGroup
     Properties:
       InstanceType:
         Ref: InstanceTypeParameter
@@ -205,7 +191,6 @@ Resources:
       Domain: vpc
       InstanceId: !Ref EC2Instance
     DependsOn:
-      - EC2Instance
       - VPCGatewayAttachment
 
   ElasticIPAssociation:
diff --git a/roles/cloud-ec2/tasks/cloudformation.yml b/roles/cloud-ec2/tasks/cloudformation.yml
index f05ab37..18fe29e 100644
--- a/roles/cloud-ec2/tasks/cloudformation.yml
+++ b/roles/cloud-ec2/tasks/cloudformation.yml
@@ -9,7 +9,6 @@
     template: roles/cloud-ec2/files/stack.yaml
     template_parameters:
       InstanceTypeParameter: "{{ cloud_providers.ec2.size }}"
-      PublicSSHKeyParameter: "{{ lookup('file', SSH_keys.public) }}"
       ImageIdParameter: "{{ ami_image }}"
       WireGuardPort: "{{ wireguard_port }}"
       UseThisElasticIP: "{{ existing_eip }}"
diff --git a/roles/wireguard/templates/client.conf.j2 b/roles/wireguard/templates/client.conf.j2
index 409ec18..a6e48a5 100644
--- a/roles/wireguard/templates/client.conf.j2
+++ b/roles/wireguard/templates/client.conf.j2
@@ -9,5 +9,5 @@ DNS = {{ wireguard_dns_servers }}
 PublicKey = {{ lookup('file', wireguard_pki_path + '/public/' + IP_subject_alt_name) }}
 PresharedKey = {{ lookup('file', wireguard_pki_path + '/preshared/' + item.1) }}
 AllowedIPs = 0.0.0.0/0,::/0
-Endpoint = {{ IP_subject_alt_name }}:{{ wireguard_port }}
+Endpoint = {% if ':' in IP_subject_alt_name %}[{{ IP_subject_alt_name }}]:{{ wireguard_port }}{% else %}{{ IP_subject_alt_name }}:{{ wireguard_port }}{% endif %}
 {{ 'PersistentKeepalive = ' + wireguard_PersistentKeepalive|string if wireguard_PersistentKeepalive > 0 else '' }}