diff --git a/src/modules/connection/client.config.ts b/src/modules/connection/client.config.ts
index 03a6428..8f1cbb4 100644
--- a/src/modules/connection/client.config.ts
+++ b/src/modules/connection/client.config.ts
@@ -16,10 +16,10 @@ export class ConnectionClientConfiguration {
         ConnectionManager.ProtoPackages.WritePackage,
         ConnectionManager.ProtoPackages.ReadPackage,
       ],
-      // credentials:
-      //   process.env.LOCAL_ENV || process.env.ENV === 'local'
-      //     ? undefined
-      //     : credentials.createSsl(),
+      credentials:
+        process.env.LOCAL_ENV || process.env.ENV === 'local'
+          ? undefined
+          : credentials.createSsl(),
       protoPath: [
         ConnectionManager.ProtoPaths.WriteFilePath,
         ConnectionManager.ProtoPaths.ReadFilePath,
diff --git a/src/modules/connector/client.config.ts b/src/modules/connector/client.config.ts
index 3d19b3d..711f265 100644
--- a/src/modules/connector/client.config.ts
+++ b/src/modules/connector/client.config.ts
@@ -16,10 +16,10 @@ export class ConnectorClientConfiguration {
         ConnectorManager.ProtoPackages.WritePackage,
         ConnectorManager.ProtoPackages.ReadPackage,
       ],
-      // credentials:
-      //   process.env.LOCAL_ENV || process.env.ENV === 'local'
-      //     ? undefined
-      //     : credentials.createSsl(),
+      credentials:
+        process.env.LOCAL_ENV || process.env.ENV === 'local'
+          ? undefined
+          : credentials.createSsl(),
       protoPath: [
         ConnectorManager.ProtoPaths.WriteFilePath,
         ConnectorManager.ProtoPaths.ReadFilePath,
diff --git a/src/modules/network-config/network-config-client.config.ts b/src/modules/network-config/network-config-client.config.ts
index 62af81f..09bed03 100644
--- a/src/modules/network-config/network-config-client.config.ts
+++ b/src/modules/network-config/network-config-client.config.ts
@@ -17,8 +17,8 @@ export class NetworkConfigGrpcClient {
         NetworkConfig.ProtoPackages.ReadPackage,
         NetworkConfig.ProtoPackages.WritePackage,
       ],
-      // credentials:
-      //   process.env.ENV === 'local' ? undefined : credentials.createSsl(),
+      credentials:
+        process.env.ENV === 'local' ? undefined : credentials.createSsl(),
       protoPath: [
         NetworkConfig.ProtoPaths.ReadFilePath,
         NetworkConfig.ProtoPaths.WriteFilePath,
diff --git a/src/modules/pipelines/pipelines-client.ts b/src/modules/pipelines/pipelines-client.ts
index 484d61b..cfca399 100644
--- a/src/modules/pipelines/pipelines-client.ts
+++ b/src/modules/pipelines/pipelines-client.ts
@@ -13,10 +13,10 @@ export class PipelinesClientConfiguration {
     options: {
       url: process.env.PIFACTORY_URL,
       package: PipelinePackages,
-      // credentials:
-      //   process.env.LOCAL_ENV || process.env.ENV === 'local'
-      //     ? undefined
-      //     : credentials.createSsl(),
+      credentials:
+        process.env.LOCAL_ENV || process.env.ENV === 'local'
+          ? undefined
+          : credentials.createSsl(),
       protoPath: PipelineProtoFilePath,
       loader: {
         keepCase: true,
diff --git a/src/modules/pipelinesV2/pipelines-client.ts b/src/modules/pipelinesV2/pipelines-client.ts
index 37f942b..0ddce5a 100644
--- a/src/modules/pipelinesV2/pipelines-client.ts
+++ b/src/modules/pipelinesV2/pipelines-client.ts
@@ -16,10 +16,10 @@ export class PipelinesClientConfiguration {
     options: {
       url: process.env.PIFACTORY_URL,
       package: [ProtoPackages.ReadPackage, ProtoPackages.WritePackage],
-      // credentials:
-      //   process.env.LOCAL_ENV || process.env.ENV === 'local'
-      //     ? undefined
-      //     : credentials.createSsl(),
+      credentials:
+        process.env.LOCAL_ENV || process.env.ENV === 'local'
+          ? undefined
+          : credentials.createSsl(),
       protoPath: [ProtoPaths.ReadFilePath, ProtoPaths.WriteFilePath],
       loader: {
         keepCase: true,