diff --git a/ansible/roles/killbill/tasks/install_plugins.yml b/ansible/roles/killbill/tasks/install_plugins.yml
index 5f44cb80..d24f461f 100644
--- a/ansible/roles/killbill/tasks/install_plugins.yml
+++ b/ansible/roles/killbill/tasks/install_plugins.yml
@@ -18,8 +18,9 @@
   loop_control:
     loop_var: plugin
 
-- name: Load Hyperswitch plugin tasks
-  ansible.builtin.include_tasks: plugins/hyperswitch.yml
+# TODO: Uncomment this when Hyperswitch supports Java 21
+# - name: Load Hyperswitch plugin tasks
+#   ansible.builtin.include_tasks: plugins/hyperswitch.yml
 
 - name: Load Aviate plugin tasks
   ansible.builtin.include_tasks: plugins/aviate.yml
diff --git a/ansible/templates/kaui/kpm.yml.j2 b/ansible/templates/kaui/kpm.yml.j2
index 7c14fcc9..352c1060 100644
--- a/ansible/templates/kaui/kpm.yml.j2
+++ b/ansible/templates/kaui/kpm.yml.j2
@@ -1,5 +1,6 @@
 ---
 kaui:
   # Used for the sha1.yml
+  version: {{ kaui_version | default('LATEST') }}
   plugins_dir: {{ kaui_plugins_dir }}
   webapp_path: {{ catalina_base }}/{{ kaui_webapps }}/ROOT.war
diff --git a/kpm/lib/kpm/nexus_helper/maven_central_api_calls.rb b/kpm/lib/kpm/nexus_helper/maven_central_api_calls.rb
index f1e764cd..b197b01b 100644
--- a/kpm/lib/kpm/nexus_helper/maven_central_api_calls.rb
+++ b/kpm/lib/kpm/nexus_helper/maven_central_api_calls.rb
@@ -14,7 +14,7 @@ class MavenCentralApiCalls < NexusApiCallsV2
       attr_reader :configuration
       attr_accessor :logger
 
-      BASE_REPO_URL = 'https://repo1.maven.org/maven2'
+      BASE_REPO_URL = 'https://dl.cloudsmith.io/<token>'
       SEARCH_API = 'https://search.maven.org/solrsearch/select'
 
       def initialize(configuration, _ssl_verify, logger)