diff --git a/doc/developers_guide/developers_guide.md b/doc/developers_guide/developers_guide.md
index a175464..d3689e0 100644
--- a/doc/developers_guide/developers_guide.md
+++ b/doc/developers_guide/developers_guide.md
@@ -4,11 +4,13 @@
 
 1. Make a copy of the latest template in `scripts` for the new version
 2. Update the new template
-3. Upload the template to S3 bucket `exasol-cf-templates` in region `eu-central-1` (prod account), e.g.:
+3. Upload the template to S3 bucket `exasol-cf-templates` in region `eu-central-1` (prod account) and re-enable public read access:
   ```sh
-  aws s3 cp scripts/cloudformation_template_v1.1.0.yml s3://exasol-cf-templates/cloudformation_template_v1.1.0.yml
+  version=v1.1.0
+  aws s3 cp scripts/cloudformation_template_${version}.yml s3://exasol-cf-templates/cloudformation_template_${version}.yml
+  aws s3api put-object-acl --bucket exasol-cf-templates --key cloudformation_template_${version}.yml --acl public-read
   ```
-4. Enable public read access for the uploaded file
+
 
 ## CI Tests
 
diff --git a/main.tf b/main.tf
index 12c6d18..5991847 100644
--- a/main.tf
+++ b/main.tf
@@ -4,7 +4,7 @@ data "aws_ami" "exasol" {
 
   filter {
     name = "name"
-    values = ["*${var.ami_image_name}-*"]
+    values = ["*${var.ami_image_name}*"]
   }
 }
 
diff --git a/test/simple_exasol_setup/main.tf b/test/simple_exasol_setup/main.tf
index f7ff1f9..dc8ce41 100644
--- a/test/simple_exasol_setup/main.tf
+++ b/test/simple_exasol_setup/main.tf
@@ -124,7 +124,7 @@ module "exasol" {
   source = "../../"
   cluster_name = "${local.project_tag}-exasol-cluster"
   database_name = "exadb"
-  ami_image_name = "Exasol-R7.1.26-BYOL"
+  ami_image_name = "Exasol-R7.1.26-PAYG"
   sys_user_password = var.exasol_sys_password
   admin_user_password = var.exasol_admin_password
   management_server_instance_type = "m5.large"
diff --git a/test/terraform_test.go b/test/terraform_test.go
index a7e2ca8..57f0ca3 100644
--- a/test/terraform_test.go
+++ b/test/terraform_test.go
@@ -38,19 +38,25 @@ func getRandomPassword() string {
 }
 
 func assertCanConnect(t *testing.T, ip string, sysPassword string) {
+	port := 8563
+	t.Logf("Checking connection to %q:%d...", ip, port)
 	config := exasol.NewConfig("sys", sysPassword).
-		Port(8563).
+		Port(port).
 		Host(ip).
 		ValidateServerCertificate(false)
 
 	conn, err := sql.Open("exasol", config.String())
 	if err != nil {
 		t.Error("Failed to connect to the exasol database: " + err.Error())
+	} else {
+		t.Logf("Connection to %q:%d successful", ip, port)
 	}
 	defer conn.Close()
 
 	_, err = conn.Exec("SELECT * FROM DUAL")
 	if err != nil {
 		t.Error("Failed to run query on the exasol database: " + err.Error())
+	} else {
+		t.Log("SQL query succeeded")
 	}
 }