diff --git a/index/generator/library/library_test.go b/index/generator/library/library_test.go
index f8ff6ab27..9bd15e2fe 100644
--- a/index/generator/library/library_test.go
+++ b/index/generator/library/library_test.go
@@ -184,7 +184,7 @@ func TestValidateIndexComponent(t *testing.T) {
 			"Case 8: check for missing arch",
 			schema.Schema{
 				Name: "nodejs",
-				Icon: "https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg",
+				Icon: "https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/node-js.svg",
 				Git: &schema.Git{
 					Remotes: map[string]string{
 						"origin": "https://github.com/redhat-developer/devfile-sample",
@@ -200,7 +200,7 @@ func TestValidateIndexComponent(t *testing.T) {
 			"Case 9: check for missing provider",
 			schema.Schema{
 				Name: "nodejs",
-				Icon: "https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg",
+				Icon: "https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/node-js.svg",
 				Versions: []schema.Version{
 					{
 						Version:       "1.0.0",
@@ -226,7 +226,7 @@ func TestValidateIndexComponent(t *testing.T) {
 			"Case 10: check for missing supportUrl",
 			schema.Schema{
 				Name: "nodejs",
-				Icon: "https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg",
+				Icon: "https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/node-js.svg",
 				Versions: []schema.Version{
 					{
 						Version:       "1.0.0",
@@ -361,7 +361,7 @@ func TestValidateIndexComponent(t *testing.T) {
 			"Case 16: test happy path for for sample component with new struct",
 			schema.Schema{
 				Name: "nodejs",
-				Icon: "https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg",
+				Icon: "https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/node-js.svg",
 				Versions: []schema.Version{
 					{
 						Version:       "1.0.0",
diff --git a/index/generator/tests/registry/extraDevfileEntries.yaml b/index/generator/tests/registry/extraDevfileEntries.yaml
index d54ecbbde..ecb4b7630 100644
--- a/index/generator/tests/registry/extraDevfileEntries.yaml
+++ b/index/generator/tests/registry/extraDevfileEntries.yaml
@@ -3,7 +3,7 @@ samples:
   - name: nodejs-basic
     displayName: Basic NodeJS
     description: A simple Hello World application
-    icon: https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg
+    icon: https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/node-js.svg
     tags: ["NodeJS", "Express"]
     projectType: nodejs
     language: nodejs
diff --git a/index/generator/tests/registry/index_extra.json b/index/generator/tests/registry/index_extra.json
index c21021aff..a63da1da7 100644
--- a/index/generator/tests/registry/index_extra.json
+++ b/index/generator/tests/registry/index_extra.json
@@ -8,7 +8,7 @@
       "NodeJS",
       "Express"
     ],
-    "icon": "https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg",
+    "icon": "https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/node-js.svg",
     "projectType": "nodejs",
     "language": "nodejs",
     "versions": [
diff --git a/index/generator/tests/registry/index_main.json b/index/generator/tests/registry/index_main.json
index 53cfb7bc9..3f5e307bc 100644
--- a/index/generator/tests/registry/index_main.json
+++ b/index/generator/tests/registry/index_main.json
@@ -324,7 +324,7 @@
   },
   {
     "name": "nodejs",
-    "icon": "https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg",
+    "icon": "https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/node-js.svg",
     "displayName": "NodeJS Runtime",
     "description": "Stack with NodeJS 12",
     "type": "stack",
@@ -337,7 +337,7 @@
         "schemaVersion": "2.2.0",
         "default": true,
         "description": "Stack with NodeJS 12",
-        "icon": "https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg",
+        "icon": "https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/node-js.svg",
         "tags": ["NodeJS", "Express", "ubi8"],
         "links": {
           "self": "devfile-catalog/nodejs:1.0.0"
@@ -424,7 +424,7 @@
     "description": "A simple Hello World application",
     "type": "sample",
     "tags": ["NodeJS", "Express"],
-    "icon": "https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg",
+    "icon": "https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/node-js.svg",
     "projectType": "nodejs",
     "language": "nodejs",
     "versions": [
diff --git a/index/generator/tests/registry/index_registry.json b/index/generator/tests/registry/index_registry.json
index 802f6b9a7..b29dcc706 100644
--- a/index/generator/tests/registry/index_registry.json
+++ b/index/generator/tests/registry/index_registry.json
@@ -325,7 +325,7 @@
   {
     "name": "nodejs",
     "displayName": "NodeJS Runtime",
-    "icon": "https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg",
+    "icon": "https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/node-js.svg",
     "description": "Stack with NodeJS 12",
     "type": "stack",
     "tags": ["NodeJS", "Express", "ubi8"],
@@ -337,7 +337,7 @@
         "schemaVersion": "2.2.0",
         "default": true,
         "description": "Stack with NodeJS 12",
-        "icon": "https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg",
+        "icon": "https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/node-js.svg",
         "tags": ["NodeJS", "Express", "ubi8"],
         "links": {
           "self": "devfile-catalog/nodejs:1.0.0"
diff --git a/index/generator/tests/registry/samples/nodejs-basic/1.0.0/devfile.yaml b/index/generator/tests/registry/samples/nodejs-basic/1.0.0/devfile.yaml
index 8be376200..9cc11b6dc 100644
--- a/index/generator/tests/registry/samples/nodejs-basic/1.0.0/devfile.yaml
+++ b/index/generator/tests/registry/samples/nodejs-basic/1.0.0/devfile.yaml
@@ -1,7 +1,7 @@
 schemaVersion: 2.0.0
 metadata:
   name: nodejs
-  icon: https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg
+  icon: https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/node-js.svg
   version: 1.0.1
   displayName: Node.js Runtime
   description: Stack with Node.js 14
diff --git a/index/generator/tests/registry/samples/nodejs-basic/1.0.1/devfile.yaml b/index/generator/tests/registry/samples/nodejs-basic/1.0.1/devfile.yaml
index fd494e290..8284cdf45 100644
--- a/index/generator/tests/registry/samples/nodejs-basic/1.0.1/devfile.yaml
+++ b/index/generator/tests/registry/samples/nodejs-basic/1.0.1/devfile.yaml
@@ -1,7 +1,7 @@
 schemaVersion: 2.2.0
 metadata:
   name: nodejs
-  icon: https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg
+  icon: https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/node-js.svg
   version: 1.0.1
   displayName: Node.js Runtime
   description: Stack with Node.js 14
diff --git a/index/generator/tests/registry/stacks/nodejs/devfile.yaml b/index/generator/tests/registry/stacks/nodejs/devfile.yaml
index 35190eec8..39ceb977e 100644
--- a/index/generator/tests/registry/stacks/nodejs/devfile.yaml
+++ b/index/generator/tests/registry/stacks/nodejs/devfile.yaml
@@ -1,7 +1,7 @@
 schemaVersion: 2.2.0
 metadata:
   name: nodejs
-  icon: https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg
+  icon: https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/node-js.svg
   version: 1.0.0
   displayName: NodeJS Runtime
   description: Stack with NodeJS 12
diff --git a/index/server/pkg/util/index.json b/index/server/pkg/util/index.json
index 43e77faa2..e3e25a4d4 100644
--- a/index/server/pkg/util/index.json
+++ b/index/server/pkg/util/index.json
@@ -225,7 +225,7 @@
     "version": "1.0.0",
     "displayName": "NodeJS Runtime",
     "description": "Stack with NodeJS 12",
-    "icon": "https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg",
+    "icon": "https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/node-js.svg",
     "type": "stack",
     "tags": [
       "NodeJS",
@@ -297,7 +297,7 @@
     "version": "1.0.1",
     "displayName": "Basic NodeJS",
     "description": "A simple Hello World application",
-    "icon": "https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg",
+    "icon": "https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/node-js.svg",
     "type": "sample",
     "projectType": "nodejs",
     "language": "nodejs"
diff --git a/index/server/registry-REST-API.adoc b/index/server/registry-REST-API.adoc
index d2303ebf5..56b6d4790 100644
--- a/index/server/registry-REST-API.adoc
+++ b/index/server/registry-REST-API.adoc
@@ -1198,7 +1198,7 @@ curl http://devfile-registry.192.168.1.1.nip.io/v2index/sample
       "NodeJS",
       "Express"
     ],
-    "icon": "https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg",
+    "icon": "https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/node-js.svg",
     "projectType": "nodejs",
     "language": "nodejs",
     "versions": [
@@ -1565,7 +1565,7 @@ curl http://devfile-registry.192.168.1.1.nip.io/v2index/all
       "NodeJS",
       "Express"
     ],
-    "icon": "https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg",
+    "icon": "https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/node-js.svg",
     "projectType": "nodejs",
     "language": "nodejs",
     "versions": [
@@ -1776,7 +1776,7 @@ curl http://devfile-registry.192.168.1.1.nip.io/v2index/sample?minSchemaVersion=
       "NodeJS",
       "Express"
     ],
-    "icon": "https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg",
+    "icon": "https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/node-js.svg",
     "projectType": "nodejs",
     "language": "nodejs",
     "versions": [
@@ -1953,7 +1953,7 @@ metadata:
   version: 1.0.1
   displayName: Node.js Runtime
   description: Stack with Node.js 14
-  icon: https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg
+  icon: https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/node-js.svg
   tags: ['NodeJS', 'Express', 'ubi8']
   projectType: 'nodejs'
   language: 'javascript'
diff --git a/index/server/tests/registry/extraDevfileEntries.yaml b/index/server/tests/registry/extraDevfileEntries.yaml
index d54ecbbde..ecb4b7630 100644
--- a/index/server/tests/registry/extraDevfileEntries.yaml
+++ b/index/server/tests/registry/extraDevfileEntries.yaml
@@ -3,7 +3,7 @@ samples:
   - name: nodejs-basic
     displayName: Basic NodeJS
     description: A simple Hello World application
-    icon: https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg
+    icon: https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/node-js.svg
     tags: ["NodeJS", "Express"]
     projectType: nodejs
     language: nodejs
diff --git a/index/server/tests/registry/index_extra.json b/index/server/tests/registry/index_extra.json
index c21021aff..a63da1da7 100644
--- a/index/server/tests/registry/index_extra.json
+++ b/index/server/tests/registry/index_extra.json
@@ -8,7 +8,7 @@
       "NodeJS",
       "Express"
     ],
-    "icon": "https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg",
+    "icon": "https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/node-js.svg",
     "projectType": "nodejs",
     "language": "nodejs",
     "versions": [
diff --git a/index/server/tests/registry/index_main.json b/index/server/tests/registry/index_main.json
index ba588a21a..c3020ad58 100644
--- a/index/server/tests/registry/index_main.json
+++ b/index/server/tests/registry/index_main.json
@@ -337,7 +337,7 @@
   },
   {
     "name": "nodejs",
-    "icon": "https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg",
+    "icon": "https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/node-js.svg",
     "displayName": "NodeJS Runtime",
     "description": "Stack with NodeJS 12",
     "type": "stack",
@@ -354,7 +354,7 @@
         "schemaVersion": "2.2.0",
         "default": true,
         "description": "Stack with NodeJS 12",
-        "icon": "https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg",
+        "icon": "https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/node-js.svg",
         "tags": [
           "NodeJS",
           "Express",
@@ -454,7 +454,7 @@
       "NodeJS",
       "Express"
     ],
-    "icon": "https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg",
+    "icon": "https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/node-js.svg",
     "projectType": "nodejs",
     "language": "nodejs",
     "versions": [
diff --git a/index/server/tests/registry/index_registry.json b/index/server/tests/registry/index_registry.json
index 1f7b160d8..fa731b6d7 100644
--- a/index/server/tests/registry/index_registry.json
+++ b/index/server/tests/registry/index_registry.json
@@ -337,7 +337,7 @@
   },
   {
     "name": "nodejs",
-    "icon": "https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg",
+    "icon": "https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/node-js.svg",
     "displayName": "NodeJS Runtime",
     "description": "Stack with NodeJS 12",
     "type": "stack",
@@ -354,7 +354,7 @@
         "schemaVersion": "2.2.0",
         "default": true,
         "description": "Stack with NodeJS 12",
-        "icon": "https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg",
+        "icon": "https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/node-js.svg",
         "tags": [
           "NodeJS",
           "Express",
diff --git a/index/server/tests/resources/newIndexStruct.json b/index/server/tests/resources/newIndexStruct.json
index 040e478bc..524e438d7 100644
--- a/index/server/tests/resources/newIndexStruct.json
+++ b/index/server/tests/resources/newIndexStruct.json
@@ -143,7 +143,7 @@
     "name": "nodejs",
     "displayName": "NodeJS Runtime",
     "description": "Stack with NodeJS 12",
-    "icon": "https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg",
+    "icon": "https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/node-js.svg",
     "type": "stack",
     "tags": [
       "NodeJS",
@@ -164,7 +164,7 @@
         "schemaVersion": "2.0.0",
         "default": true,
         "description": "Stack with NodeJS 12",
-        "icon": "https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg",
+        "icon": "https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/node-js.svg",
         "tags": [
           "NodeJS",
           "Express",
@@ -195,7 +195,7 @@
       "NodeJS",
       "Express"
     ],
-    "icon": "https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg",
+    "icon": "https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/node-js.svg",
     "projectType": "nodejs",
     "language": "nodejs",
     "versions": [
@@ -209,7 +209,7 @@
           }
         },
         "description": "nodejs with devfile v2.2.0",
-        "icon": "https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg"
+        "icon": "https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/node-js.svg"
       }
     ]
   },
diff --git a/index/server/tests/resources/oldIndexStruct.json b/index/server/tests/resources/oldIndexStruct.json
index 4d7052564..9e5c8778e 100644
--- a/index/server/tests/resources/oldIndexStruct.json
+++ b/index/server/tests/resources/oldIndexStruct.json
@@ -82,7 +82,7 @@
     "version": "1.0.0",
     "displayName": "NodeJS Runtime",
     "description": "Stack with NodeJS 12",
-    "icon": "https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg",
+    "icon": "https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/node-js.svg",
     "type": "stack",
     "tags": [
       "NodeJS",
@@ -116,7 +116,7 @@
       "NodeJS",
       "Express"
     ],
-    "icon": "https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg",
+    "icon": "https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/node-js.svg",
     "projectType": "nodejs",
     "language": "nodejs",
     "git": {
diff --git a/tests/registry/extraDevfileEntries.yaml b/tests/registry/extraDevfileEntries.yaml
index 79bd603fb..fb83274f5 100644
--- a/tests/registry/extraDevfileEntries.yaml
+++ b/tests/registry/extraDevfileEntries.yaml
@@ -3,7 +3,7 @@ samples:
   - name: nodejs-basic
     displayName: Basic Node.js
     description: A simple Hello World Node.js application
-    icon: https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg
+    icon: https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/node-js.svg
     tags: ["NodeJS", "Express"]
     projectType: nodejs
     language: nodejs
diff --git a/tests/registry/stacks/nodejs/devfile.yaml b/tests/registry/stacks/nodejs/devfile.yaml
index 68dd2075b..c9e5b9f1d 100644
--- a/tests/registry/stacks/nodejs/devfile.yaml
+++ b/tests/registry/stacks/nodejs/devfile.yaml
@@ -4,7 +4,7 @@ metadata:
   version: 1.0.0
   displayName: NodeJS Runtime
   description: Stack with NodeJS 12
-  icon: https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg
+  icon: https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/node-js.svg
   tags: ["NodeJS", "Express", "ubi8"]
   projectType: "nodejs"
   language: "nodejs"