diff --git a/.lighthouse/jenkins-x/pullrequest.yaml b/.lighthouse/jenkins-x/pullrequest.yaml
index b2ad513b..b087674f 100644
--- a/.lighthouse/jenkins-x/pullrequest.yaml
+++ b/.lighthouse/jenkins-x/pullrequest.yaml
@@ -11,27 +11,9 @@ spec:
       taskSpec:
         metadata: {}
         stepTemplate:
-          env:
-          - name: PORT
-            value: "3003"
-          - name: NODE_ENV
-            value: "production"
-          - name: NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY
-            value: ""
-          - name: NEXT_PUBLIC_BONDE_API_GRAPHQL_URL
-            value: "ws://api-graphql.staging.bonde.org/v1/graphql"
-          - name: BONDE_API_GRAPHQL_URL
-            value: "https://api-graphql.staging.bonde.org/v1/graphql"
-          - name: STRIPE_SECRET_KEY
-            value: ""
-          - name: NEXT_PUBLIC_INCUBATIONS_WIDGET_ID
-            value: "20292"
-          - name: NEXT_PUBLIC_MATERIALS_WIDGET_ID
-            value: "20293"
-          - name: NEXT_PUBLIC_DONATION_WIDGET_ID
-            value: "24146"
-          - name: NEXT_PUBLIC_NEWSLETTER_WIDGET_ID
-            value: "24147"
+          envFrom:
+            - secretRef:
+                name: nossas-org
           image: uses:jenkins-x/jx3-pipeline-catalog/tasks/typescript/pullrequest.yaml@versionStream
           name: ""
           resources:
diff --git a/.lighthouse/jenkins-x/release.yaml b/.lighthouse/jenkins-x/release.yaml
index fccb4e28..bc414c0a 100644
--- a/.lighthouse/jenkins-x/release.yaml
+++ b/.lighthouse/jenkins-x/release.yaml
@@ -11,29 +11,9 @@ spec:
       taskSpec:
         metadata: {}
         stepTemplate:
-          env:
-          - name: PORT
-            value: "3003"
-          - name: NODE_ENV
-            value: "production"
-          - name: NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY
-            value: ""
-          - name: NEXT_PUBLIC_BONDE_API_GRAPHQL_URL
-            value: "ws://api-graphql.staging.bonde.org/v1/graphql"
-          - name: BONDE_API_GRAPHQL_URL
-            value: "https://api-graphql.staging.bonde.org/v1/graphql"
-          - name: STRIPE_SECRET_KEY
-            value: ""
-          - name: NEXT_PUBLIC_INCUBATIONS_WIDGET_ID
-            value: "20292"
-          - name: NEXT_PUBLIC_MATERIALS_WIDGET_ID
-            value: "20293"
-          - name: NEXT_PUBLIC_DONATION_WIDGET_ID
-            value: "24146"
-          - name: NEXT_PUBLIC_NEWSLETTER_WIDGET_ID
-            value: "24147"
-          - name: NPM_CONFIG_USERCONFIG
-            value: /tekton/home/npm/.npmrc
+          envFrom:
+            - secretRef:
+                name: nossas-org-prod
           image: uses:jenkins-x/jx3-pipeline-catalog/tasks/typescript/release.yaml@versionStream
           name: ""
           resources:
diff --git a/charts/nossas-org/templates/secret.yaml b/charts/nossas-org/templates/secret.yaml
new file mode 100644
index 00000000..33635e40
--- /dev/null
+++ b/charts/nossas-org/templates/secret.yaml
@@ -0,0 +1,33 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: nossas-org
+type: Opaque
+data:
+  NODEV_ENV: "cHJvZHVjdGlvbgo="
+  PORT: "MzAwMwo="
+  NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY: ""
+  NEXT_PUBLIC_BONDE_API_GRAPHQL_URL: "d3NzOi8vYXBpLWdyYXBocWwvdjEvZ3JhcGhxbAo="
+  BONDE_API_GRAPHQL_URL: "aHR0cHM6Ly9hcGktZ3JhcGhxbC92MS9ncmFwaHFsCg=="
+  STRIPE_SECRET_KEY: ""
+  NEXT_PUBLIC_INCUBATIONS_WIDGET_ID: "MjAyOTIK"
+  NEXT_PUBLIC_MATERIALS_WIDGET_ID: "MjAyOTMK"
+  NEXT_PUBLIC_DONATION_WIDGET_ID: "MjQxNDYK"
+  NEXT_PUBLIC_NEWSLETTER_WIDGET_ID: "MjQxNDcK"
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: nossas-org-prod
+type: Opaque
+data:
+  NODEV_ENV: "cHJvZHVjdGlvbgo="
+  PORT: "MzAwMwo="
+  NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY: ""
+  NEXT_PUBLIC_BONDE_API_GRAPHQL_URL: "d3NzOi8vYXBpLWdyYXBocWwvdjEvZ3JhcGhxbAo="
+  BONDE_API_GRAPHQL_URL: "aHR0cHM6Ly9hcGktZ3JhcGhxbC92MS9ncmFwaHFsCg=="
+  STRIPE_SECRET_KEY: ""
+  NEXT_PUBLIC_INCUBATIONS_WIDGET_ID: "MjAyOTIK"
+  NEXT_PUBLIC_MATERIALS_WIDGET_ID: "MjAyOTMK"
+  NEXT_PUBLIC_DONATION_WIDGET_ID: "MjQxNDYK"
+  NEXT_PUBLIC_NEWSLETTER_WIDGET_ID: "MjQxNDcK"
\ No newline at end of file
diff --git a/charts/nossas-org/values.yaml b/charts/nossas-org/values.yaml
index a5f0f47a..cf8deac6 100755
--- a/charts/nossas-org/values.yaml
+++ b/charts/nossas-org/values.yaml
@@ -14,17 +14,10 @@ canary:
   labels: {}
   progressDeadlineSeconds: 60
 deploymentLabels: {}
-env:
-  PORT: "3003"
-  NODE_ENV: "production"
-  NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY: ""
-  NEXT_PUBLIC_BONDE_API_GRAPHQL_URL: "ws://api-graphql.staging.bonde.org/v1/graphql"
-  BONDE_API_GRAPHQL_URL: "https://api-graphql.staging.bonde.org/v1/graphql"
-  STRIPE_SECRET_KEY: ""
-  NEXT_PUBLIC_INCUBATIONS_WIDGET_ID: "20292"
-  NEXT_PUBLIC_MATERIALS_WIDGET_ID: "20293"
-  NEXT_PUBLIC_DONATION_WIDGET_ID: "24146"
-  NEXT_PUBLIC_NEWSLETTER_WIDGET_ID: "24147"
+env: {}
+envFrom:
+  - secretRef:
+      name: nossas-org
 hpa:
   cpuTargetAverageUtilization: 80
   enabled: false