diff --git a/.github/workflows/main-build.yml b/.github/workflows/main-build.yml
index d49fc44cd7f..f32ca9410cd 100644
--- a/.github/workflows/main-build.yml
+++ b/.github/workflows/main-build.yml
@@ -103,7 +103,9 @@ jobs:
           AZURE_LOG_ANALYTICS_WORKSPACE_ID: ${{ secrets.AZURE_LOG_ANALYTICS_WORKSPACE_ID }}
           AZURE_RESOURCE_GROUP: ${{ secrets.AZURE_RESOURCE_GROUP }}
           AZURE_SERVICE_BUS_CONNECTION_STRING:  ${{ secrets.AZURE_SERVICE_BUS_CONNECTION_STRING }}
-          AZURE_SP_ID: ${{ secrets.AZURE_SP_ID }}
+          AZURE_SP_APP_ID: ${{ secrets.AZURE_SP_APP_ID }}
+          AZURE_SP_OBJECT_ID: ${{ secrets.AZURE_SP_OBJECT_ID }}
+          AZURE_SP_ID: ${{ secrets.AZURE_SP_ID }} # Deprecated, use AZURE_SP_APP_ID instead
           AZURE_SP_KEY: ${{ secrets.AZURE_SP_KEY }}
           AZURE_SP_TENANT: ${{ secrets.AZURE_SP_TENANT }}
           AZURE_STORAGE_CONNECTION_STRING: ${{ secrets.AZURE_STORAGE_CONNECTION_STRING }}
@@ -115,6 +117,7 @@ jobs:
           NEWRELIC_ACCOUNT_ID: ${{ secrets.NEWRELIC_ACCOUNT_ID}}
           NEWRELIC_API_KEY: ${{ secrets.NEWRELIC_API_KEY}}
           NEWRELIC_LICENSE: ${{ secrets.NEWRELIC_LICENSE}}
+          OIDC_ISSUER_URL: ${{ secrets.OIDC_ISSUER_URLNIGHTLY }}
           OPENSTACK_AUTH_URL: ${{ secrets.OPENSTACK_AUTH_URL }}
           OPENSTACK_PASSWORD: ${{ secrets.OPENSTACK_PASSWORD }}
           OPENSTACK_PROJECT_ID: ${{ secrets.OPENSTACK_PROJECT_ID }}
@@ -127,7 +130,8 @@ jobs:
         run: make e2e-test-clean
         env:
           AZURE_RESOURCE_GROUP: ${{ secrets.AZURE_RESOURCE_GROUP }}
-          AZURE_SP_ID: ${{ secrets.AZURE_SP_ID }}
+          AZURE_SP_APP_ID: ${{ secrets.AZURE_SP_APP_ID }}
+          AZURE_SP_ID: ${{ secrets.AZURE_SP_ID }} # Deprecated, use AZURE_SP_APP_ID instead
           AZURE_SP_KEY: ${{ secrets.AZURE_SP_KEY }}
           AZURE_SP_TENANT: ${{ secrets.AZURE_SP_TENANT }}
           AZURE_SUBSCRIPTION: ${{ secrets.AZURE_SUBSCRIPTION }}
diff --git a/.github/workflows/nightly-e2e.yml b/.github/workflows/nightly-e2e.yml
index 82f6046a0eb..b71a64e5cbd 100644
--- a/.github/workflows/nightly-e2e.yml
+++ b/.github/workflows/nightly-e2e.yml
@@ -34,7 +34,9 @@ jobs:
           AZURE_LOG_ANALYTICS_WORKSPACE_ID: ${{ secrets.AZURE_LOG_ANALYTICS_WORKSPACE_ID }}
           AZURE_RESOURCE_GROUP: ${{ secrets.AZURE_RESOURCE_GROUP }}
           AZURE_SERVICE_BUS_CONNECTION_STRING:  ${{ secrets.AZURE_SERVICE_BUS_CONNECTION_STRING }}
-          AZURE_SP_ID: ${{ secrets.AZURE_SP_ID }}
+          AZURE_SP_APP_ID: ${{ secrets.AZURE_SP_APP_ID }}
+          AZURE_SP_OBJECT_ID: ${{ secrets.AZURE_SP_OBJECT_ID }}
+          AZURE_SP_ID: ${{ secrets.AZURE_SP_ID }} # Deprecated, use AZURE_SP_APP_ID instead
           AZURE_SP_KEY: ${{ secrets.AZURE_SP_KEY }}
           AZURE_SP_TENANT: ${{ secrets.AZURE_SP_TENANT }}
           AZURE_STORAGE_CONNECTION_STRING: ${{ secrets.AZURE_STORAGE_CONNECTION_STRING }}
@@ -46,6 +48,7 @@ jobs:
           NEWRELIC_ACCOUNT_ID: ${{ secrets.NEWRELIC_ACCOUNT_ID}}
           NEWRELIC_API_KEY: ${{ secrets.NEWRELIC_API_KEY}}
           NEWRELIC_LICENSE: ${{ secrets.NEWRELIC_LICENSE}}
+          OIDC_ISSUER_URL: ${{ secrets.OIDC_ISSUER_URLNIGHTLY }}
           OPENSTACK_AUTH_URL: ${{ secrets.OPENSTACK_AUTH_URL }}
           OPENSTACK_PASSWORD: ${{ secrets.OPENSTACK_PASSWORD }}
           OPENSTACK_PROJECT_ID: ${{ secrets.OPENSTACK_PROJECT_ID }}
@@ -58,7 +61,8 @@ jobs:
         run: make e2e-test-clean
         env:
           AZURE_RESOURCE_GROUP: ${{ secrets.AZURE_RESOURCE_GROUP }}
-          AZURE_SP_ID: ${{ secrets.AZURE_SP_ID }}
+          AZURE_SP_APP_ID: ${{ secrets.AZURE_SP_APP_ID }}
+          AZURE_SP_ID: ${{ secrets.AZURE_SP_ID }} # Deprecated, use AZURE_SP_APP_ID instead
           AZURE_SP_KEY: ${{ secrets.AZURE_SP_KEY }}
           AZURE_SP_TENANT: ${{ secrets.AZURE_SP_TENANT }}
           AZURE_SUBSCRIPTION: ${{ secrets.AZURE_SUBSCRIPTION }}
diff --git a/.github/workflows/pr-e2e.yml b/.github/workflows/pr-e2e.yml
index adf97539ff2..6af039f8758 100644
--- a/.github/workflows/pr-e2e.yml
+++ b/.github/workflows/pr-e2e.yml
@@ -83,7 +83,9 @@ jobs:
           AZURE_LOG_ANALYTICS_WORKSPACE_ID: ${{ secrets.AZURE_LOG_ANALYTICS_WORKSPACE_ID }}
           AZURE_RESOURCE_GROUP: ${{ secrets.AZURE_RESOURCE_GROUP }}
           AZURE_SERVICE_BUS_CONNECTION_STRING:  ${{ secrets.AZURE_SERVICE_BUS_CONNECTION_STRING }}
-          AZURE_SP_ID: ${{ secrets.AZURE_SP_ID }}
+          AZURE_SP_APP_ID: ${{ secrets.AZURE_SP_APP_ID }}
+          AZURE_SP_OBJECT_ID: ${{ secrets.AZURE_SP_OBJECT_ID }}
+          AZURE_SP_ID: ${{ secrets.AZURE_SP_ID }} # Deprecated, use AZURE_SP_APP_ID instead
           AZURE_SP_KEY: ${{ secrets.AZURE_SP_KEY }}
           AZURE_SP_TENANT: ${{ secrets.AZURE_SP_TENANT }}
           AZURE_STORAGE_CONNECTION_STRING: ${{ secrets.AZURE_STORAGE_CONNECTION_STRING }}
@@ -96,6 +98,7 @@ jobs:
           NEWRELIC_ACCOUNT_ID: ${{ secrets.NEWRELIC_ACCOUNT_ID}}
           NEWRELIC_API_KEY: ${{ secrets.NEWRELIC_API_KEY}}
           NEWRELIC_LICENSE: ${{ secrets.NEWRELIC_LICENSE}}
+          OIDC_ISSUER_URL: ${{ secrets.OIDC_ISSUER_URLPR }}
           OPENSTACK_AUTH_URL: ${{ secrets.OPENSTACK_AUTH_URL }}
           OPENSTACK_PASSWORD: ${{ secrets.OPENSTACK_PASSWORD }}
           OPENSTACK_PROJECT_ID: ${{ secrets.OPENSTACK_PROJECT_ID }}
@@ -117,7 +120,8 @@ jobs:
         run: make e2e-test-clean
         env:
           AZURE_RESOURCE_GROUP: ${{ secrets.AZURE_RESOURCE_GROUP }}
-          AZURE_SP_ID: ${{ secrets.AZURE_SP_ID }}
+          AZURE_SP_APP_ID: ${{ secrets.AZURE_SP_APP_ID }}
+          AZURE_SP_ID: ${{ secrets.AZURE_SP_ID }} # Deprecated, use AZURE_SP_APP_ID instead
           AZURE_SP_KEY: ${{ secrets.AZURE_SP_KEY }}
           AZURE_SP_TENANT: ${{ secrets.AZURE_SP_TENANT }}
           AZURE_SUBSCRIPTION: ${{ secrets.AZURE_SUBSCRIPTION }}
diff --git a/.github/workflows/v1-build.yml b/.github/workflows/v1-build.yml
index 4d0354802ea..11ecda21b1b 100644
--- a/.github/workflows/v1-build.yml
+++ b/.github/workflows/v1-build.yml
@@ -39,7 +39,8 @@ jobs:
         env:
           AZURE_SUBSCRIPTION: ${{ secrets.AZURE_SUBSCRIPTION }}
           AZURE_RESOURCE_GROUP: ${{ secrets.AZURE_RESOURCE_GROUP }}
-          AZURE_SP_ID: ${{ secrets.AZURE_SP_ID }}
+          AZURE_SP_APP_ID: ${{ secrets.AZURE_SP_APP_ID }}
+          AZURE_SP_ID: ${{ secrets.AZURE_SP_ID }} # Deprecated, use AZURE_SP_APP_ID instead
           AZURE_SP_KEY: ${{ secrets.AZURE_SP_KEY }}
           AZURE_SP_TENANT: ${{ secrets.AZURE_SP_TENANT }}
           AZURE_STORAGE_CONNECTION_STRING: ${{ secrets.AZURE_STORAGE_CONNECTION_STRING }}
diff --git a/Makefile b/Makefile
index df1839b0923..d543098c0aa 100644
--- a/Makefile
+++ b/Makefile
@@ -71,7 +71,7 @@ test: manifests generate fmt vet envtest ## Run tests.
 
 .PHONY: get-cluster-context
 get-cluster-context: ## Get Azure cluster context.
-	@az login --service-principal -u $(AZURE_SP_ID) -p "$(AZURE_SP_KEY)" --tenant $(AZURE_SP_TENANT)
+	@az login --service-principal -u $(AZURE_SP_APP_ID) -p "$(AZURE_SP_KEY)" --tenant $(AZURE_SP_TENANT)
 	@az aks get-credentials \
 		--name $(TEST_CLUSTER_NAME) \
 		--subscription $(AZURE_SUBSCRIPTION) \
diff --git a/tests/scalers/azure-app-insights.test.ts b/tests/scalers/azure-app-insights.test.ts
index 1fdf76bcd4b..4dbe1ade8f4 100644
--- a/tests/scalers/azure-app-insights.test.ts
+++ b/tests/scalers/azure-app-insights.test.ts
@@ -11,7 +11,7 @@ import { createNamespace } from './helpers'
 const namespacePrefix = 'azure-ai-test-'
 const app_insights_app_id = process.env['AZURE_APP_INSIGHTS_APP_ID']
 const app_insights_instrumentation_key = process.env['AZURE_APP_INSIGHTS_INSTRUMENTATION_KEY']
-const sp_id = process.env['AZURE_SP_ID']
+const sp_id = process.env['AZURE_SP_APP_ID']
 const sp_key = process.env['AZURE_SP_KEY']
 const sp_tenant = process.env['AZURE_SP_TENANT']
 const test_pod_id = process.env['TEST_POD_ID'] == "true"
diff --git a/tests/scalers/azure-data-explorer.test.ts b/tests/scalers/azure-data-explorer.test.ts
index 7f8da1e5455..7865b87b7f4 100644
--- a/tests/scalers/azure-data-explorer.test.ts
+++ b/tests/scalers/azure-data-explorer.test.ts
@@ -6,7 +6,7 @@ import { createNamespace } from './helpers'
 
 const dataExplorerDb = process.env['AZURE_DATA_EXPLORER_DB']
 const dataExplorerEndpoint = process.env['AZURE_DATA_EXPLORER_ENDPOINT']
-const spId = process.env['AZURE_SP_ID']
+const spId = process.env['AZURE_SP_APP_ID']
 const spSecret = process.env['AZURE_SP_KEY']
 const spTenantId = process.env['AZURE_SP_TENANT']
 
diff --git a/tests/scalers/azure-keyvault-queue.test.ts b/tests/scalers/azure-keyvault-queue.test.ts
index 5a7434854a4..3374dbc29f2 100644
--- a/tests/scalers/azure-keyvault-queue.test.ts
+++ b/tests/scalers/azure-keyvault-queue.test.ts
@@ -10,7 +10,7 @@ const testNamespace = 'azure-keyvault-queue-test'
 const queueName = 'queue-name-trigger'
 const connectionString = process.env['AZURE_STORAGE_CONNECTION_STRING']
 const keyvaultURI = process.env['AZURE_KEYVAULT_URI']
-const azureADClientID = process.env['AZURE_SP_ID']
+const azureADClientID = process.env['AZURE_SP_APP_ID']
 const azureADClientSecret = process.env['AZURE_SP_KEY']
 const azureADTenantID = process.env['AZURE_SP_TENANT']
 
@@ -24,7 +24,7 @@ test.before(async t => {
   }
 
   if (!azureADClientID) {
-    t.fail('AZURE_SP_ID environment variable is required for keyvault tests')
+    t.fail('AZURE_SP_APP_ID environment variable is required for keyvault tests')
   }
 
   if (!azureADClientSecret) {
diff --git a/tests/scalers/azure-log-analytics.test.ts b/tests/scalers/azure-log-analytics.test.ts
index 0f783c3c0b6..0f5870b2a00 100644
--- a/tests/scalers/azure-log-analytics.test.ts
+++ b/tests/scalers/azure-log-analytics.test.ts
@@ -6,7 +6,7 @@ import { createNamespace } from './helpers'
 
 const defaultNamespace = 'azure-log-analytics-test'
 const la_workspace_id = process.env['AZURE_LOG_ANALYTICS_WORKSPACE_ID']
-const sp_id = process.env['AZURE_SP_ID']
+const sp_id = process.env['AZURE_SP_APP_ID']
 const sp_key = process.env['AZURE_SP_KEY']
 const sp_tenant = process.env['AZURE_SP_TENANT']