diff --git a/.github/workflows/format-php.yml b/.github/workflows/format-php.yml
index e536275..91687ca 100644
--- a/.github/workflows/format-php.yml
+++ b/.github/workflows/format-php.yml
@@ -7,5 +7,5 @@ on:
 
 jobs:
   php-cs-fixer:
-    uses: yardinternet/workflows/.github/workflows/format-php.yml@main
+    uses: yardinternet/workflows/.github/workflows/format-php.yml@feat/signed-commit
     secrets: inherit
diff --git a/src/Basic.php b/src/Basic.php
index 395ad27..ff38914 100644
--- a/src/Basic.php
+++ b/src/Basic.php
@@ -122,8 +122,11 @@ public function configure()
 			->addDirective(Directive::STYLE, 'https://*.typekit.net')
 
 			// ElasticSearch
-			->addDirective(Directive::CONNECT, env('WP_ENV') == 'production' ? 'https://es.elk01.yard.nl/' : 'https://es.test01.yard.nl')
-			->addDirective(Directive::CONNECT, 'https://elasticsearch-yard.app.owc.shockapp.io')
+			->addDirective(Directive::CONNECT, env('WP_ENV') === 'production' ? 'https://es.elk01.yard.nl/' : 'https://es.test01.yard.nl')
+			->addDirective(
+				Directive::CONNECT,
+				env('WP_ENV') === 'production' ? 'https://elasticsearch-yard.app.owc.shockapp.io' : 'https://elasticsearch-yard-staging.app.owc.shockapp.io'
+			)
 
 			// Google Translate
 			->addDirective(Directive::CONNECT, [
@@ -132,6 +135,7 @@ public function configure()
 			])
 			->addDirective(Directive::SCRIPT, [
 				'https://translate.googleapis.com',
+
 				'https://www.google.com',
 			])
 			->addDirective(Directive::STYLE, 'https://www.gstatic.com')
@@ -160,7 +164,8 @@ public function configure()
 
 			// ReadSpeaker
 			->addDirective(Directive::CONNECT, ['https://cdn-eu.readspeaker.com', 'https://app-eu.readspeaker.com', 'https://vttts-eu.readspeaker.com'])
-			->addDirective(Directive::STYLE, ['https://cdn-eu.readspeaker.com', 'https://app-eu.readspeaker.com'])
+			->addDirective(Directive::STYLE, ['https://cdn-eu.readspeaker.com',
+				'https://app-eu.readspeaker.com'])
 			->addDirective(Directive::FORM_ACTION, ['https://app-eu.readspeaker.com'])
 			->addDirective(Directive::FRAME, ['https://app-eu.readspeaker.com'])