diff --git a/build/Makefile b/build/Makefile
index 4e5bf8fd4f..c7dc4e9795 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -40,7 +40,7 @@ pmm2-ovf-el9-rc: fetch-el9
 	sed -i 's|become_method: su|become_method: sudo|g' update/tasks/roles/postgres/tasks/main.yml && \
 	/usr/bin/packer build \
 			-var 'pmm_client_repos=pmm2-client testing' \
-			-var 'pmm_client_repo_name=percona-testing-x86_64' \
+			-var 'pmm_client_repo_name=pmm2-client-testing-x86_64' \
 			-var 'pmm2_server_repo=testing' \
 			-only virtualbox-ovf -color=false packer/pmm2.el9.json \
 					| tee build.log
@@ -49,7 +49,7 @@ pmm2-ovf-el9-dev-latest: fetch-el9
 	sed -i 's|become_method: su|become_method: sudo|g' update/tasks/roles/postgres/tasks/main.yml && \
 	/usr/bin/packer build \
 			-var 'pmm_client_repos=pmm2-client experimental' \
-			-var 'pmm_client_repo_name=percona-experimental-x86_64' \
+			-var 'pmm_client_repo_name=pmm2-client-experimental-x86_64' \
 			-var 'pmm2_server_repo=experimental' \
 			-only virtualbox-ovf -color=false packer/pmm2.el9.json \
 					| tee build.log
@@ -63,7 +63,7 @@ pmm2-azure:
 pmm2-ami:
 	docker run --rm -v ${HOME}/.aws:/root/.aws -v `pwd`:/build -w /build hashicorp/packer:${PACKER_VERSION} \
 			build -var 'pmm_client_repos=pmm2-client experimental' \
-						-var 'pmm_client_repo_name=percona-experimental-x86_64' \
+						-var 'pmm_client_repo_name=pmm2-client-experimental-x86_64' \
 						-var 'pmm2_server_repo=experimental' \
 						-only amazon-ebs -color=false \
 				  	packer/pmm2.json
@@ -71,7 +71,7 @@ pmm2-ami:
 pmm2-ami-rc:
 	docker run --rm -v ${HOME}/.aws:/root/.aws -v `pwd`:/build -w /build hashicorp/packer:${PACKER_VERSION} \
 			build -var 'pmm_client_repos=pmm2-client testing' \
-				  	-var 'pmm_client_repo_name=percona-testing-x86_64' \
+				  	-var 'pmm_client_repo_name=pmm2-client-testing-x86_64' \
 				  	-var 'pmm2_server_repo=testing' \
 				  	-only amazon-ebs '-color=false' \
 				  	packer/pmm2.json
@@ -82,7 +82,7 @@ pmm2-ami-el9:
 		sed -i 's|become_method: su|become_method: sudo|g' update/tasks/roles/postgres/tasks/main.yml && \
 		docker run --rm -v ${HOME}/.aws:/root/.aws -v `pwd`:/build -w /build hashicorp/packer:${PACKER_VERSION} \
 		build -var 'pmm_client_repos=pmm2-client experimental' \
-					-var 'pmm_client_repo_name=percona-experimental-x86_64' \
+					-var 'pmm_client_repo_name=pmm2-client-experimental-x86_64' \
 					-var 'pmm2_server_repo=experimental' \
 					-only amazon-ebs -color=false \
 					packer/pmm2.el9.json
@@ -93,7 +93,7 @@ pmm2-ami-el9-rc:
 			sed -i 's|become_method: su|become_method: sudo|g' update/tasks/roles/postgres/tasks/main.yml && \
 			docker run --rm -v ${HOME}/.aws:/root/.aws -v `pwd`:/build -w /build hashicorp/packer:${PACKER_VERSION} \
 			build -var 'pmm_client_repos=pmm2-client testing' \
-				  	-var 'pmm_client_repo_name=percona-testing-x86_64' \
+				  	-var 'pmm_client_repo_name=pmm2-client-testing-x86_64' \
 				  	-var 'pmm2_server_repo=testing' \
 				  	-only amazon-ebs '-color=false' \
 				  	packer/pmm2.el9.json
diff --git a/build/ansible/roles/pmm2-images/vars/main.yml b/build/ansible/roles/pmm2-images/vars/main.yml
index 5a25e24065..7410e4a875 100644
--- a/build/ansible/roles/pmm2-images/vars/main.yml
+++ b/build/ansible/roles/pmm2-images/vars/main.yml
@@ -3,4 +3,4 @@ pmm2_server_repo: release
 pmm_client_repos: "pmm2-client testing"
 
 # line below is sed'ed by build-server-docker script
-pmm_client_repo_name: "percona-testing-x86_64"
+pmm_client_repo_name: "pmm2-client-testing-x86_64"
diff --git a/build/packer/pmm2.el9.json b/build/packer/pmm2.el9.json
index 58e9a29ddf..ea1b7c118a 100644
--- a/build/packer/pmm2.el9.json
+++ b/build/packer/pmm2.el9.json
@@ -15,13 +15,13 @@
           "delete_on_termination": true,
           "device_name": "/dev/sda1",
           "volume_size": 10,
-          "volume_type": "gp2"
+          "volume_type": "gp3"
         },
         {
           "delete_on_termination": false,
           "device_name": "/dev/sdb",
           "volume_size": 100,
-          "volume_type": "gp2"
+          "volume_type": "gp3"
         }
       ],
       "region": "us-east-1",
diff --git a/build/packer/pmm2.json b/build/packer/pmm2.json
index 88b16fd397..0637a259e2 100644
--- a/build/packer/pmm2.json
+++ b/build/packer/pmm2.json
@@ -3,7 +3,7 @@
       "single_disk": "false",
       "pmm2_server_repo": "testing",
       "pmm_client_repos": "pmm2-client testing",
-      "pmm_client_repo_name": "percona-testing-x86_64"
+      "pmm_client_repo_name": "pmm2-client-testing-x86_64"
     },
     "builders": [{
             "type": "amazon-ebs",
@@ -13,18 +13,18 @@
                     "delete_on_termination": true,
                     "device_name": "/dev/sda1",
                     "volume_size": 8,
-                    "volume_type": "gp2"
+                    "volume_type": "gp3"
                 },
                 {
                     "delete_on_termination": false,
                     "device_name": "/dev/sdb",
                     "volume_size": 100,
-                    "volume_type": "gp2"
+                    "volume_type": "gp3"
                 }
             ],
             "region": "us-east-1",
             "security_group_id": "sg-688c2b1c",
-            "source_ami": "ami-00e87074e52e6c9f9",
+            "source_ami": "ami-0aedf6b1cb669b4c7",
             "ssh_pty": "true",
             "ena_support": "true",
             "ssh_username": "centos",
@@ -106,8 +106,11 @@
     "provisioners": [{
             "type": "shell",
             "inline": [
+                "sudo sed -i 's/enabled=1/enabled=0/g' /etc/yum/pluginconf.d/fastestmirror.conf",
+                "sudo sed -i -e 's/^\\(mirrorlist\\)/#\\1/g' /etc/yum.repos.d/CentOS-Base.repo",
+                "sudo sed -i -e 's|^#baseurl.*|baseurl=http://vault.centos.org/centos/\\$releasever/os/\\$basearch/|g' /etc/yum.repos.d/CentOS-Base.repo",
                 "sudo yum -y update",
-                "sudo yum -y install epel-release",
+                "sudo yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm",
                 "sudo yum -y install ansible"
             ]
         },