diff --git a/deployment/deploy.tfvars b/deployment/deploy.tfvars
index 52bbb8c..635db67 100644
--- a/deployment/deploy.tfvars
+++ b/deployment/deploy.tfvars
@@ -6,6 +6,3 @@ ip_pool = "public-network"
 
 # Flavor: m1.medium 2cores/4GB
 flavor_id = "df25f80f-ed19-4e0b-805e-d34620ba0334"
-
-# Image: Ubuntu-20.04-20211006
-image_id = "582840e6-3cc1-4133-ad20-6b302239ce19"
diff --git a/deployment/galaxy-requirements.yaml b/deployment/galaxy-requirements.yaml
index 6f5b010..c686d54 100644
--- a/deployment/galaxy-requirements.yaml
+++ b/deployment/galaxy-requirements.yaml
@@ -1,4 +1,2 @@
-# docker installation
-- src: grycap.docker
 # ssh-oidc access
 - src: grycap.motley_cue
diff --git a/deployment/main.tf b/deployment/main.tf
index 7c73dbf..55dd542 100644
--- a/deployment/main.tf
+++ b/deployment/main.tf
@@ -1,6 +1,6 @@
 resource "openstack_compute_instance_v2" "dashboard" {
   name      = "dashboard"
-  image_id  = var.image_id
+  image_id  = data.openstack_images_image_v2.egi-docker.id
   flavor_id = var.flavor_id
   user_data = file("cloud-init.yaml")
   network {
diff --git a/deployment/playbook.yaml b/deployment/playbook.yaml
index b703ed9..eba6cad 100644
--- a/deployment/playbook.yaml
+++ b/deployment/playbook.yaml
@@ -12,8 +12,6 @@
   become: yes
   gather_facts: yes
   roles:
-    - role: "grycap.docker"
-      docker_config_values: { "mtu": 1400 }
     - role: "grycap.motley_cue"
       ssh_oidc_other_vos_name: cloud.egi.eu
       ssh_oidc_other_vos_role: auditor
@@ -30,14 +28,20 @@
     - name: Move motley-cue to a different port (nginx)
       ansible.builtin.lineinfile:
         path: /etc/nginx/sites-available/nginx.motley_cue
-        search_string: "8080;"
-        line: 8181;
+        regexp: ".*listen 8080;$"
+        line: "    listen 8181;"
+
+    - name: No IPv6 for motley-cue (nginx)
+      ansible.builtin.lineinfile:
+        path: /etc/nginx/sites-available/nginx.motley_cue
+        search_string: "listen [::]:8080;"
+        state: absent
 
     - name: Move motley-cue to a different port (pam-ssh-oidc)
       ansible.builtin.lineinfile:
         path: /etc/pam.d/pam-ssh-oidc-config.ini
-        search_string: "http://localhost:8080/verify_user"
-        line: http://localhost:8181/verify_user
+        regexp: "^verify_endpoint = http://localhost:8080/verify_user$"
+        line: "verify_endpoint = http://localhost:8181/verify_user"
 
     - name: Restart nginx
       ansible.builtin.service:
diff --git a/deployment/vars.tf b/deployment/vars.tf
index 67d57bb..e2af68e 100644
--- a/deployment/vars.tf
+++ b/deployment/vars.tf
@@ -8,9 +8,12 @@ variable "ip_pool" {
   description = "The floating ip pool"
 }
 
-variable "image_id" {
-  type        = string
-  description = "VM image id"
+# https://appdb.egi.eu/store/vappliance/egi.docker
+data "openstack_images_image_v2" "egi-docker" {
+  most_recent = true
+  properties = {
+    "ad:appid" = "1006"
+  }
 }
 
 variable "flavor_id" {