diff --git a/libs/core/src/functions/fetch-devfiles/devfiles.json b/libs/core/src/functions/fetch-devfiles/devfiles.json
index 192c714c..148f1073 100644
--- a/libs/core/src/functions/fetch-devfiles/devfiles.json
+++ b/libs/core/src/functions/fetch-devfiles/devfiles.json
@@ -67,6 +67,40 @@
       }
     ]
   },
+  {
+    "name": "dotnet80",
+    "displayName": ".NET 8.0",
+    "description": "Stack with .NET 8.0",
+    "type": "stack",
+    "tags": [
+      "dotnet"
+    ],
+    "icon": "data:image/png;base64,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",
+    "projectType": "dotnet",
+    "language": "dotnet",
+    "versions": [
+      {
+        "version": "1.0.0",
+        "schemaVersion": "2.1.0",
+        "default": true,
+        "description": "Stack with .NET 8.0",
+        "tags": [
+          "dotnet"
+        ],
+        "icon": "https://github.com/dotnet/brand/raw/main/logo/dotnet-logo.png",
+        "links": {
+          "self": "devfile-catalog/dotnet80:1.0.0"
+        },
+        "resources": [
+          "archive.tar",
+          "devfile.yaml"
+        ],
+        "starterProjects": [
+          "s2i-example"
+        ]
+      }
+    ]
+  },
   {
     "name": "dotnetcore31",
     "displayName": ".NET Core 3.1",
@@ -1067,4 +1101,4 @@
     },
     "provider": "Red Hat"
   }
-]
\ No newline at end of file
+]
diff --git a/libs/docs/src/docs/no-version/creating-a-devfile-stack.md b/libs/docs/src/docs/no-version/creating-a-devfile-stack.md
index b44d6d06..d2f74f79 100644
--- a/libs/docs/src/docs/no-version/creating-a-devfile-stack.md
+++ b/libs/docs/src/docs/no-version/creating-a-devfile-stack.md
@@ -34,7 +34,7 @@ There you can include yourself as a reviewer (For more information check the [ow
     metadata:
       name: tutorial-stack
       displayName: Tutorial Stack
-      description: Test stack based on .Net 6.0
+      description: Test stack based on .Net 8.0
       icon: https://github.com/dotnet/brand/raw/main/logo/dotnet-logo.png
       tags:
         - .NET
@@ -50,7 +50,7 @@ There you can include yourself as a reviewer (For more information check the [ow
         git:
         checkoutFrom:
             remote: origin
-            revision: dotnet-6.0
+            revision: dotnet-8.0
         remotes:
             origin: https://github.com/redhat-developer/s2i-dotnetcore-ex
         subDir: app
@@ -61,7 +61,7 @@ There you can include yourself as a reviewer (For more information check the [ow
     components:
     - name: dotnet
         container:
-        image: registry.access.redhat.com/ubi8/dotnet-60:6.0
+        image: registry.access.redhat.com/ubi8/dotnet-80:8.0-9
         args: ["tail", "-f", "/dev/null"]
         mountSources: true
         env:
@@ -74,7 +74,7 @@ There you can include yourself as a reviewer (For more information check the [ow
             - name: ASPNETCORE_URLS
             value: http://*:8080
         endpoints:
-            - name: http-dotnet60
+            - name: http-dotnet80
             targetPort: 8080
     ```
 
@@ -105,7 +105,7 @@ There you can include yourself as a reviewer (For more information check the [ow
     metadata:
     name: tutorial-stack
     displayName: Tutorial Stack
-    description: Test stack based on .Net 6.0
+    description: Test stack based on .Net 8.0
     icon: https://github.com/dotnet/brand/raw/main/logo/dotnet-logo.png
     tags:
         - .NET
@@ -117,14 +117,14 @@ There you can include yourself as a reviewer (For more information check the [ow
         git:
         checkoutFrom:
             remote: origin
-            revision: dotnet-6.0
+            revision: dotnet-8.0
         remotes:
             origin: https://github.com/redhat-developer/s2i-dotnetcore-ex
         subDir: app
     components:
     - name: dotnet
         container:
-        image: registry.access.redhat.com/ubi8/dotnet-60:6.0
+        image: registry.access.redhat.com/ubi8/dotnet-80:8.0-9
         args: ["tail", "-f", "/dev/null"]
         mountSources: true
         env:
@@ -137,7 +137,7 @@ There you can include yourself as a reviewer (For more information check the [ow
             - name: ASPNETCORE_URLS
             value: http://*:8080
         endpoints:
-            - name: http-dotnet60
+            - name: http-dotnet80
             targetPort: 8080
     commands:
     - id: build
@@ -162,7 +162,7 @@ There you can include yourself as a reviewer (For more information check the [ow
     ```yaml {% filename="stack.yaml" %}
     name: tutorial-stack
     displayName: Tutorial Stack
-    description: Test stack based on .Net 6.0
+    description: Test stack based on .Net 8.0
     icon: https://github.com/dotnet/brand/raw/main/logo/dotnet-logo.png
     versions:
     - version: 2.2.0