diff --git a/env.py b/env.py
index 37a57567a1f5d4e1430a3d1b0df643280f9a02c7..741dffec029695bb59eec705570291b0c14d0bb3 100644
--- a/env.py
+++ b/env.py
@@ -11,7 +11,7 @@ USERNAME = os.getenv("CUSTOM_ENV_USERNAME") or os.getenv("USERNAME")
 PRIVATE_KEY_PATH = f"{os.getenv('HOME')}/priv_key-{VM_NAME}"
 SSH_TIMEOUT = os.getenv("CUSTOM_ENV_SSH_TIMEOUT") or os.getenv("SSH_TIMEOUT") or "20"
 FLOATING_IP_NETWORK = os.getenv("FLOATING_IP_NETWORK") or "public"
-SSH_IP_VERSION = os.getenv("SSH_IP_VERSION") or "4"
+SSH_IP_VERSION = os.getenv("SSH_IP_VERSION") or "6"
 BUILD_FAILURE_EXIT_CODE = os.getenv("BUILD_FAILURE_EXIT_CODE")
 SYSTEM_FAILURE_EXIT_CODE = os.getenv("SYSTEM_FAILURE_EXIT_CODE")
 SERVER_CREATION_TIMEOUT = os.getenv("SERVER_CREATION_TIMEOUT") or "300"
diff --git a/prepare.py b/prepare.py
index 2d04f95a10f036e06c9f3ff272ba21befb90acc8..f0da063ce7d2c83bd9430444b5e9589cc6c14935 100644
--- a/prepare.py
+++ b/prepare.py
@@ -19,6 +19,7 @@ def provision_server(
     conn: openstack.connection.Connection,
     public_key: str
 ) -> openstack.compute.v2.server.Server:
+    floating_ip = True if env.SSH_IP_VERSION == "4" else False
     conn.create_keypair(env.KEY_PAIR_NAME, public_key=public_key)
     image = conn.compute.find_image(env.BUILDER_IMAGE)
     flavor = conn.compute.find_flavor(env.FLAVOR)
@@ -27,6 +28,7 @@ def provision_server(
         name=env.VM_NAME,
         flavor=flavor.id,
         image=image.id,
+        auto_ip=floating_ip,
         boot_from_volume=True,
         terminate_volume=True,
         volume_size=env.VOLUME_SIZE,