diff --git a/content/en/blog/demystifying-fission-pool-manager.md b/content/en/blog/demystifying-fission-pool-manager.md
index 77653c38..5edd303e 100644
--- a/content/en/blog/demystifying-fission-pool-manager.md
+++ b/content/en/blog/demystifying-fission-pool-manager.md
@@ -103,7 +103,7 @@ You can control the default pool size based on your needs. You can do so by sett
 For instance, the below code snippet with create a new Python environment with a poolsize of 1.
 
 ```bash
-$ fission env create --name python --version **3** --poolsize **1** --image ghcr.io/fission/python-env:latest
+$ fission env create --name python --version **3** --poolsize **1** --image ghcr.io/fission/python-env
 $ kubectl get pod -l environmentName**=**test
 ```
 
diff --git a/content/en/blog/fission-zapier-webhook/index.md b/content/en/blog/fission-zapier-webhook/index.md
index 62a2dd46..2d1264b5 100644
--- a/content/en/blog/fission-zapier-webhook/index.md
+++ b/content/en/blog/fission-zapier-webhook/index.md
@@ -122,7 +122,7 @@ type: Opaque
 Create a Python environment
 
 ```bash
-fission environment create --name python --image ghcr.io/fission/python-env --builder ghcr.io/fission/python-builder:latest
+fission environment create --name python --image ghcr.io/fission/python-env --builder ghcr.io/fission/python-builder
 ```
 
 Create a zip archive as sample.zip archive by executing package.sh script
diff --git a/content/en/blog/fission_github_action.md b/content/en/blog/fission_github_action.md
index aa2a0fcc..5f7d8251 100644
--- a/content/en/blog/fission_github_action.md
+++ b/content/en/blog/fission_github_action.md
@@ -95,7 +95,7 @@ In the logs below, we can see that Fission Action applied the specs and the envi
 ```
 ### STARTED FissionCD 15:16:50Z
 
-Pulling image: gcr.io/github-actions-images/action-runner:latest
+Pulling image: gcr.io/github-actions-images/action-runner
 latest: Pulling from github-actions-images/action-runner
 169185f82c45: Pulling fs layer
 0ccde4b6b241: Pulling fs layer
diff --git a/content/en/blog/how-to-use-fission-functions-with-postgresql-database/index.md b/content/en/blog/how-to-use-fission-functions-with-postgresql-database/index.md
index 80f574b6..5417bc34 100644
--- a/content/en/blog/how-to-use-fission-functions-with-postgresql-database/index.md
+++ b/content/en/blog/how-to-use-fission-functions-with-postgresql-database/index.md
@@ -122,13 +122,13 @@ After this create a docker image and push it to your Docker hub repository.
 Building the docker image for our custom Python environment. *(Replace the username with your actual username on Docker Hub.)*
 
 ``` bash
-docker build -t username/python-postgres:latest --build-arg PY_BASE_IMG=3.7-alpine -f Dockerfile .
+docker build -t username/python-postgres --build-arg PY_BASE_IMG=3.7-alpine -f Dockerfile .
 ```
 
 Pushing the docker image to Docker Hub registry:
 
 ``` bash
-docker push username/python-postgres:latest
+docker push username/python-postgres
 ```
 
 #### Source Package Setup
@@ -177,7 +177,7 @@ For this voting app, we will create `python environment`, `packages`, `fission f
 Creating the Python environment:
 
 ``` bash
-fission env create --name pythonsrc --image username/python-postgres --builder ghcr.io/fission/python-builder:latest
+fission env create --name pythonsrc --image username/python-postgres --builder ghcr.io/fission/python-builder
 ```
 
 Once the environment is ready, we create two Fission packages for `backend` and `frontend`
@@ -268,7 +268,7 @@ You can open a terminal and key in the all the following commands at once.
 
 ``` yaml
 fission spec init
-fission env create --name pythonsrc --image python-postgres --builder ghcr.io/fission/python-builder:latest --spec
+fission env create --name pythonsrc --image python-postgres --builder ghcr.io/fission/python-builder --spec
 fission package create --name backend-pkg --sourcearchive backend.zip --env pythonsrc --buildcmd "./build.sh" --spec
 fission fn create --name backend --pkg backend-pkg --entrypoint "backend.main" --spec
 fission route create --name backend --method POST --url /castvote --function backend --spec
@@ -281,7 +281,7 @@ This will create a `specs` folder with specs for each resource that is required
 
 ``` bash
 fission spec init
-fission env create --name pythonsrc --image atulinfracloud/python-postgres --builder ghcr.io/fission/python-builder:latest --spec
+fission env create --name pythonsrc --image atulinfracloud/python-postgres --builder ghcr.io/fission/python-builder --spec
 fission package create --name backend-pkg --sourcearchive backend.zip --env pythonsrc --buildcmd "./build.sh" --spec
 fission fn create --name backend --pkg backend-pkg --entrypoint "backend.main" --spec
 fission route create --name backend --method POST --url /castvote --function backend --spec
diff --git a/content/en/blog/observability-with-opentelemetry-datadog-in-fission/index.md b/content/en/blog/observability-with-opentelemetry-datadog-in-fission/index.md
index 085e4401..1ca84db5 100644
--- a/content/en/blog/observability-with-opentelemetry-datadog-in-fission/index.md
+++ b/content/en/blog/observability-with-opentelemetry-datadog-in-fission/index.md
@@ -179,13 +179,13 @@ It should look like this: `RUN apk add --update --no-cache gcc python3-dev build
 Building the docker image for our custom Python environment. *(Replace the username with your actual username on Docker Hub.)*
 
 ``` dockerfile
-docker build -t username/python-opentelemetry:latest --build-arg PY_BASE_IMG=3.7-alpine -f Dockerfile .
+docker build -t username/python-opentelemetry --build-arg PY_BASE_IMG=3.7-alpine -f Dockerfile .
 ```
 
 Pushing the docker image to Docker Hub registry:
 
 ``` dockerfile
-docker push username/python-opentelemetry:latest
+docker push username/python-opentelemetry
 ```
 
 
@@ -194,7 +194,7 @@ docker push username/python-opentelemetry:latest
 Create Fission environment:
 
 ```bash
-fission env create --name pythonoptel --image username/python-opentelemetry --builder ghcr.io/fission/python-builder:latest
+fission env create --name pythonoptel --image username/python-opentelemetry --builder ghcr.io/fission/python-builder
 ```
 
 Create source package.
@@ -233,7 +233,7 @@ With this our custom Python environment is ready along with our Fission function
 
 ```bash
 fission spec init
-fission env create --name pythonoptel --image atulinfracloud/python-opentelemetry  --builder ghcr.io/fission/python-builder:latest --spec
+fission env create --name pythonoptel --image atulinfracloud/python-opentelemetry  --builder ghcr.io/fission/python-builder --spec
 fission package create --name fissionoptel-pkg --sourcearchive sample.zip --env pythonoptel --buildcmd "./build.sh" --spec
 fission fn create --name optel --pkg fissionoptel-pkg --entrypoint "sample.main" --spec
 ```
diff --git a/content/en/blog/serverless-twitter-bot-fission/index.md b/content/en/blog/serverless-twitter-bot-fission/index.md
index cb5dc8cb..ff8c8c61 100644
--- a/content/en/blog/serverless-twitter-bot-fission/index.md
+++ b/content/en/blog/serverless-twitter-bot-fission/index.md
@@ -122,7 +122,7 @@ Deploy the secret using `kubectl apply -f secrets.yaml`
 Create a Python environment
 
 ```bash
-fission environment create --name python --image ghcr.io/fission/python-env --builder ghcr.io/fission/python-builder:latest
+fission environment create --name python --image ghcr.io/fission/python-env --builder ghcr.io/fission/python-builder
 ```
 
 Create a zip archive as sample.zip archive by executing package.sh script
diff --git a/content/en/blog/url-shortener-fission-mongo-db/index.md b/content/en/blog/url-shortener-fission-mongo-db/index.md
index 310687f8..4a30c68f 100644
--- a/content/en/blog/url-shortener-fission-mongo-db/index.md
+++ b/content/en/blog/url-shortener-fission-mongo-db/index.md
@@ -103,7 +103,7 @@ For this voting app, we will create `python environment`, `packages`, `fission f
 Create a Python environment
 
 ```bash
-fission environment create --name python --image ghcr.io/fission/python-env --builder ghcr.io/fission/python-builder:latest
+fission environment create --name python --image ghcr.io/fission/python-env --builder ghcr.io/fission/python-builder
 ```
 
 Once the environment is ready, we create two Fission packages for `backend` and `frontend`
@@ -214,7 +214,7 @@ You can open a terminal and key in the all the following commands at once.
 
 ``` yaml
 fission spec init
-fission environment create --name python --image ghcr.io/fission/python-env --builder ghcr.io/fission/python-builder:latest --spec
+fission environment create --name python --image ghcr.io/fission/python-env --builder ghcr.io/fission/python-builder --spec
 fission package create --name frontend-pkg --sourcearchive frontend.zip --env python --buildcmd "./build.sh" --spec
 fission package create --name backend-pkg --sourcearchive backend.zip --env python --buildcmd "./build.sh" --spec
 fission fn create --name frontend --pkg frontend-pkg --entrypoint "app.main" --spec
@@ -227,7 +227,7 @@ This will create a `specs` folder with specs for each resource that is required
 
 ``` bash
 fission spec init
-fission environment create --name python --image ghcr.io/fission/python-env --builder ghcr.io/fission/python-builder:latest --spec
+fission environment create --name python --image ghcr.io/fission/python-env --builder ghcr.io/fission/python-builder --spec
 fission package create --name frontend-pkg --sourcearchive frontend.zip --env python --buildcmd "./build.sh" --spec
 fission package create --name backend-pkg --sourcearchive backend.zip --env python --buildcmd "./build.sh" --spec
 fission fn create --name frontend --pkg frontend-pkg --entrypoint "app.main" --spec
diff --git a/content/en/blog/websocket-sample.md b/content/en/blog/websocket-sample.md
index 2c933cda..2e61ab22 100644
--- a/content/en/blog/websocket-sample.md
+++ b/content/en/blog/websocket-sample.md
@@ -123,7 +123,7 @@ fission spec init
 ```
 fission env create \
  --name=nodejs \
- --image=ghcr.io/fission/node-env:latest \
+ --image=ghcr.io/fission/node-env \
  --spec
 ```
 
@@ -155,7 +155,7 @@ fission httptrigger create \
 ```
 fission env create \
  --name=python \
- --image=ghcr.io/fission/python-env:latest \
+ --image=ghcr.io/fission/python-env \
  --spec
 ```
 
diff --git a/content/en/docs/usage/function/enabling-istio-on-fission.md b/content/en/docs/usage/function/enabling-istio-on-fission.md
index be4a4512..0387127e 100644
--- a/content/en/docs/usage/function/enabling-istio-on-fission.md
+++ b/content/en/docs/usage/function/enabling-istio-on-fission.md
@@ -40,7 +40,7 @@ $ helm install --namespace $FISSION_NAMESPACE --set enableIstio=true --name isti
 Let's first create the environment for nodejs function we want to create:
 
 ```bash
-$ fission env create --name nodejs --image ghcr.io/fission/node-env:latest
+$ fission env create --name nodejs --image ghcr.io/fission/node-env
 ```
 
 Let's create a simple function with Node.js environment and a simple hello world example below:
diff --git a/content/en/docs/usage/function/environments.en.md b/content/en/docs/usage/function/environments.en.md
index e680c765..3de8868f 100644
--- a/content/en/docs/usage/function/environments.en.md
+++ b/content/en/docs/usage/function/environments.en.md
@@ -30,8 +30,8 @@ For more details on builder and packages, check out examples in [Functions]({{%
 
 ```bash
 $ fission env create --name python \
-                     --image ghcr.io/fission/python-env:latest \
-                     --builder ghcr.io/fission/python-builder:latest
+                     --image ghcr.io/fission/python-env \
+                     --builder ghcr.io/fission/python-builder
 ```
 
 ## Viewing environment information
diff --git a/content/en/docs/usage/function/executor.en.md b/content/en/docs/usage/function/executor.en.md
index b108561d..9f502976 100644
--- a/content/en/docs/usage/function/executor.en.md
+++ b/content/en/docs/usage/function/executor.en.md
@@ -25,7 +25,7 @@ When an environment is created, poolmgr creates a pool of generic pods with **de
 We may want to adjust the size of pools based on our need (e.g. resource efficiency), for some [historic reason](https://github.com/fission/fission/issues/506) fission now only supports to adjust pool size by giving `--version 3` flag when creating an environment.
 
 ```bash
-$ fission env create --name python --version 3 --poolsize 1 --image ghcr.io/fission/python-env:latest
+$ fission env create --name python --version 3 --poolsize 1 --image ghcr.io/fission/python-env
 
 $ kubectl get pod -l environmentName=test
 ```
diff --git a/content/en/docs/usage/function/functions.en.md b/content/en/docs/usage/function/functions.en.md
index cd1a3639..8f4054d7 100644
--- a/content/en/docs/usage/function/functions.en.md
+++ b/content/en/docs/usage/function/functions.en.md
@@ -206,8 +206,8 @@ $ chmod +x build.sh
 You first need to create an environment with environment image and python-builder image specified:
 
 ```bash
-$ fission env create --name python --image ghcr.io/fission/python-env:latest \
-                     --builder ghcr.io/fission/python-builder:latest \
+$ fission env create --name python --image ghcr.io/fission/python-env \
+                     --builder ghcr.io/fission/python-builder \
                      --mincpu 40 --maxcpu 80 \
                      --minmemory 64 --maxmemory 128 \
                      --poolsize 2
diff --git a/content/en/docs/usage/function/package.en.md b/content/en/docs/usage/function/package.en.md
index 59a43066..6090a6fc 100644
--- a/content/en/docs/usage/function/package.en.md
+++ b/content/en/docs/usage/function/package.en.md
@@ -9,8 +9,8 @@ weight: 35
 Before you create a package, you need to create an environment with an associated builder image:
 
 ```bash
-$ fission env create --name pythonsrc --image ghcr.io/fission/python-env:latest \
-                     --builder ghcr.io/fission/python-builder:latest \
+$ fission env create --name pythonsrc --image ghcr.io/fission/python-env \
+                     --builder ghcr.io/fission/python-builder \
                      --mincpu 40 --maxcpu 80 \
                      --minmemory 64 --maxmemory 128 \
                      --poolsize 2
@@ -124,8 +124,8 @@ b: {c: 3, d: 4}
 Before you create a package you need to create an environment with the builder image:
 
 ```bash
-$ fission env create --name pythondeploy --image ghcr.io/fission/python-env:latest \
-                     --builder ghcr.io/fission/python-builder:latest \
+$ fission env create --name pythondeploy --image ghcr.io/fission/python-env \
+                     --builder ghcr.io/fission/python-builder \
                      --mincpu 40 --maxcpu 80 \
                      --minmemory 64 --maxmemory 128 \
                      --poolsize 2
diff --git a/content/en/docs/usage/triggers/message-queue-trigger-kind-keda/nats-streaming.md b/content/en/docs/usage/triggers/message-queue-trigger-kind-keda/nats-streaming.md
index a44aae04..6a97c541 100644
--- a/content/en/docs/usage/triggers/message-queue-trigger-kind-keda/nats-streaming.md
+++ b/content/en/docs/usage/triggers/message-queue-trigger-kind-keda/nats-streaming.md
@@ -84,8 +84,8 @@ All the files required are present [here](https://github.com/fission/keda-connec
 Steps for deploying producer function:
 
 ```sh
-docker build . -t producer:latest
-kind load docker-image producer:latest --name kind
+docker build . -t producer
+kind load docker-image producer --name kind
 kubectl apply -f deployment.yaml //replicas is set to 0 when deployed
 ```
 
@@ -167,7 +167,7 @@ spec:
         app: nats-pub
     spec:
       containers:
-        - image: producer:latest
+        - image: producer
           imagePullPolicy: Never
           name: producer
 ```
diff --git a/content/en/environments/_index.html b/content/en/environments/_index.html
index c957a27e..2d7fef2b 100644
--- a/content/en/environments/_index.html
+++ b/content/en/environments/_index.html
@@ -41,19 +41,11 @@ <h5><label class="d-block" for="filter-lang">Filter by language</label></h5>
   document.getElementById("filter-lang").innerHTML = languageOptions.join(' ');
 
   function getBadge(imageName) {
-    if (imageName.includes("node") || imageName.includes("python") || imageName.includes("go") || imageName.includes("binary")) {
-      return `<h4 class="d-inline-block mx-1 my-0">
-        <a href="https://github.com/fission/environments/pkgs/container/${imageName}" class="badge badge-light text-wrap" target="_blank">
-          ${imageName}
-        </a>
-      </h4>`
-    } else {
-      return `<h4 class="d-inline-block mx-1 my-0">
-        <a href="https://hub.docker.com/r/fission/${imageName}" class="badge badge-light text-wrap" target="_blank">
-          ${imageName}
-        </a>
-      </h4>`
-    }
+    return `<h4 class="d-inline-block mx-1 my-0">
+      <a href="https://github.com/fission/environments/pkgs/container/${imageName}" class="badge badge-light text-wrap" target="_blank">
+        ${imageName}
+      </a>
+    </h4>`
   }
 
   function updateEnvItems() {