diff --git a/Ansible/roles/cloudstack-manager/tasks/preconfig_globalsettings.yml b/Ansible/roles/cloudstack-manager/tasks/preconfig_globalsettings.yml
index a5dfb0ac10..04f2db8071 100644
--- a/Ansible/roles/cloudstack-manager/tasks/preconfig_globalsettings.yml
+++ b/Ansible/roles/cloudstack-manager/tasks/preconfig_globalsettings.yml
@@ -81,6 +81,11 @@
 
 - name: add admin keys for cloudmonkey
   acs_mysql_update: DBHOST="{{ mysql_master_ip }}" DBUSER="cloud" DBPASS={{ mysql_cloud_password }} MYSQL_STATEMENT="UPDATE `cloud`.`user` SET `api_key`='{{ cm_apikey }}', `secret_key`='{{ cm_secretkey_enc }}' WHERE `id`='2';"
+  when: env_numversion | version_compare('4.23','<')
+
+- name: add admin keys for cloudmonkey in api_keypair table
+  acs_mysql_update: DBHOST="{{ mysql_master_ip }}" DBUSER="cloud" DBPASS={{ mysql_cloud_password }} MYSQL_STATEMENT="UPDATE `cloud`.`api_keypair` SET `api_key`='{{ cm_apikey }}', `secret_key`='{{ cm_secretkey_enc }}' WHERE `user_id`='2';"
+  when: env_numversion | version_compare('4.23','>=')
 
 - name: test for cloud or cloudstack Usage
   stat: path=/etc/init.d/cloudstack-management