diff --git a/deploy/crds/keda.sh_v1alpha1_scaledobject_cr.yaml b/deploy/crds/keda.sh_v1alpha1_scaledobject_cr.yaml
index 689b910d0db..ae0815a788f 100644
--- a/deploy/crds/keda.sh_v1alpha1_scaledobject_cr.yaml
+++ b/deploy/crds/keda.sh_v1alpha1_scaledobject_cr.yaml
@@ -1,4 +1,4 @@
-apiVersion: keda.k8s.io/v1alpha1
+apiVersion: keda.sh/v1alpha1
 kind: ScaledObject
 metadata:
   name: example-scaledobject
diff --git a/deploy/crds/keda.sh_v1alpha1_triggerauthentication_cr.yaml b/deploy/crds/keda.sh_v1alpha1_triggerauthentication_cr.yaml
index 079a70100ad..17a49887f18 100644
--- a/deploy/crds/keda.sh_v1alpha1_triggerauthentication_cr.yaml
+++ b/deploy/crds/keda.sh_v1alpha1_triggerauthentication_cr.yaml
@@ -1,4 +1,4 @@
-apiVersion: keda.k8s.io/v1alpha1
+apiVersion: keda.sh/v1alpha1
 kind: TriggerAuthentication
 metadata:
   name: example-triggerauthentication
diff --git a/tests/scalers/prometheus.test.ts b/tests/scalers/prometheus.test.ts
index 89fa55aaa82..151cd4e801b 100644
--- a/tests/scalers/prometheus.test.ts
+++ b/tests/scalers/prometheus.test.ts
@@ -102,7 +102,7 @@ test.after.always.cb('clean up prometheus deployment', t => {
     'deployment.apps/test-app',
     'deployment.apps/keda-test-app',
     'service/test-app',
-    'scaledobject.keda.k8s.io/prometheus-scaledobject',
+    'scaledobject.keda.sh/prometheus-scaledobject',
     'job/generate-requests',
   ]
 
@@ -179,13 +179,13 @@ spec:
   selector:
     type: keda-testing
 ---
-apiVersion: keda.k8s.io/v1alpha1
+apiVersion: keda.sh/v1alpha1
 kind: ScaledObject
 metadata:
   name: prometheus-scaledobject
 spec:
   scaleTargetRef:
-    deploymentName: keda-test-app
+    name: keda-test-app
   minReplicaCount: 0
   maxReplicaCount: 5
   pollingInterval: 5
diff --git a/tests/scalers/rabbitmq-queue-amqp.test.ts b/tests/scalers/rabbitmq-queue-amqp.test.ts
index 96e9e685336..f7531c2c500 100644
--- a/tests/scalers/rabbitmq-queue-amqp.test.ts
+++ b/tests/scalers/rabbitmq-queue-amqp.test.ts
@@ -62,7 +62,7 @@ test.after.always.cb('clean up rabbitmq-queue deployment', t => {
   const resources = [
     'secret/test-secrets',
     'deployment.apps/test-deployment',
-    'scaledobject.keda.k8s.io/test-scaledobject',
+    'scaledobject.keda.sh/test-scaledobject',
   ]
 
   for (const resource of resources) {
@@ -109,15 +109,13 @@ spec:
         - secretRef:
             name: test-secrets
 ---
-apiVersion: keda.k8s.io/v1alpha1
+apiVersion: keda.sh/v1alpha1
 kind: ScaledObject
 metadata:
   name: test-scaledobject
-  labels:
-    deploymentName: test-deployment
 spec:
   scaleTargetRef:
-    deploymentName: test-deployment
+    name: test-deployment
   pollingInterval: 5
   cooldownPeriod: 10
   minReplicaCount: 0
diff --git a/tests/scalers/rabbitmq-queue-http.test.ts b/tests/scalers/rabbitmq-queue-http.test.ts
index 418a75fe2f0..d6edfab26ef 100644
--- a/tests/scalers/rabbitmq-queue-http.test.ts
+++ b/tests/scalers/rabbitmq-queue-http.test.ts
@@ -64,7 +64,7 @@ test.after.always.cb('clean up rabbitmq-queue deployment', t => {
   const resources = [
     'secret/test-secrets-api',
     'deployment.apps/test-deployment',
-    'scaledobject.keda.k8s.io/test-scaledobject',
+    'scaledobject.keda.sh/test-scaledobject',
   ]
 
   for (const resource of resources) {
@@ -111,15 +111,13 @@ spec:
         - secretRef:
             name: test-secrets-api
 ---
-apiVersion: keda.k8s.io/v1alpha1
+apiVersion: keda.sh/v1alpha1
 kind: ScaledObject
 metadata:
   name: test-scaledobject
-  labels:
-    deploymentName: test-deployment
 spec:
   scaleTargetRef:
-    deploymentName: test-deployment
+    name: test-deployment
   pollingInterval: 5
   cooldownPeriod: 10
   minReplicaCount: 0
diff --git a/tests/scalers/rabbitmq-queue-trigger-auth.test.ts b/tests/scalers/rabbitmq-queue-trigger-auth.test.ts
index caa7011d2a4..963e0ef43e1 100644
--- a/tests/scalers/rabbitmq-queue-trigger-auth.test.ts
+++ b/tests/scalers/rabbitmq-queue-trigger-auth.test.ts
@@ -63,8 +63,8 @@ test.after.always.cb('clean up rabbitmq-queue deployment', t => {
   const resources = [
     'secret/test-secrets',
     'deployment.apps/test-deployment',
-    'scaledobject.keda.k8s.io/test-scaledobject',
-    'triggerauthentications.keda.k8s.io/rabbitmq-trigger-auth',
+    'scaledobject.keda.sh/test-scaledobject',
+    'triggerauthentications.keda.sh/rabbitmq-trigger-auth',
   ]
 
   for (const resource of resources) {
@@ -109,7 +109,7 @@ spec:
         args:
           - '{{CONNECTION_STRING}}'
 ---
-apiVersion: keda.k8s.io/v1alpha1
+apiVersion: keda.sh/v1alpha1
 kind: TriggerAuthentication
 metadata:
   name: rabbitmq-trigger-auth
@@ -119,15 +119,13 @@ spec:
     name: rabbitmq-test-secret
     key: RabbitMqHost
 ---
-apiVersion: keda.k8s.io/v1alpha1
+apiVersion: keda.sh/v1alpha1
 kind: ScaledObject
 metadata:
   name: test-scaledobject
-  labels:
-    deploymentName: test-deployment
 spec:
   scaleTargetRef:
-    deploymentName: test-deployment
+    name: test-deployment
   pollingInterval: 5
   cooldownPeriod: 10
   minReplicaCount: 0