diff --git a/.github/workflows/native-image/access-environment-variables.yml b/.github/workflows/native-image-access-environment-variables.yml
similarity index 88%
rename from .github/workflows/native-image/access-environment-variables.yml
rename to .github/workflows/native-image-access-environment-variables.yml
index f951b46e5..852d94302 100644
--- a/.github/workflows/native-image/access-environment-variables.yml
+++ b/.github/workflows/native-image-access-environment-variables.yml
@@ -3,11 +3,11 @@ on:
   push:
     paths:
       - 'native-image/access-environment-variables/**'
-      - '.github/workflows/native-image/access-environment-variables.yml'
+      - '.github/workflows/native-image-access-environment-variables.yml'
   pull_request:
     paths:
       - 'native-image/access-environment-variables/**'
-      - '.github/workflows/native-image/access-environment-variables.yml'
+      - '.github/workflows/native-image-access-environment-variables.yml'
   schedule:
     - cron: "0 0 1 * *" # run every month
   workflow_dispatch:
diff --git a/.github/workflows/native-image/add-jfr.yml b/.github/workflows/native-image-add-jfr.yml
similarity index 88%
rename from .github/workflows/native-image/add-jfr.yml
rename to .github/workflows/native-image-add-jfr.yml
index 2b80fc799..80d6521d8 100644
--- a/.github/workflows/native-image/add-jfr.yml
+++ b/.github/workflows/native-image-add-jfr.yml
@@ -3,11 +3,11 @@ on:
   push:
     paths:
       - 'native-image/add-jfr/**'
-      - '.github/workflows/native-image/add-jfr.yml'
+      - '.github/workflows/native-image-add-jfr.yml'
   pull_request:
     paths:
       - 'native-image/add-jfr/**'
-      - '.github/workflows/native-image/add-jfr.yml'
+      - '.github/workflows/native-image-add-jfr.yml'
   schedule:
     - cron: "0 0 1 * *" # run every month
   workflow_dispatch:
diff --git a/.github/workflows/native-image/add-jmx.yml b/.github/workflows/native-image-add-jmx.yml
similarity index 92%
rename from .github/workflows/native-image/add-jmx.yml
rename to .github/workflows/native-image-add-jmx.yml
index 0e26eda0f..1f77a1b87 100644
--- a/.github/workflows/native-image/add-jmx.yml
+++ b/.github/workflows/native-image-add-jmx.yml
@@ -3,11 +3,11 @@ on:
   push:
     paths:
       - 'native-image/add-jmx/**'
-      - '.github/workflows/native-image/add-jmx.yml'
+      - '.github/workflows/native-image-add-jmx.yml'
   pull_request:
     paths:
       - 'native-image/add-jmx/**'
-      - '.github/workflows/native-image/add-jmx.yml'
+      - '.github/workflows/native-image-add-jmx.yml'
   schedule:
     - cron: "0 0 1 * *" # run every month
   workflow_dispatch:
diff --git a/.github/workflows/native-image/add-logging.yml b/.github/workflows/native-image-add-logging.yml
similarity index 87%
rename from .github/workflows/native-image/add-logging.yml
rename to .github/workflows/native-image-add-logging.yml
index 7c1cc0c5a..c9890849c 100644
--- a/.github/workflows/native-image/add-logging.yml
+++ b/.github/workflows/native-image-add-logging.yml
@@ -3,11 +3,11 @@ on:
   push:
     paths:
       - 'native-image/add-logging/**'
-      - '.github/workflows/native-image/add-logging.yml'
+      - '.github/workflows/native-image-add-logging.yml'
   pull_request:
     paths:
       - 'native-image/add-logging/**'
-      - '.github/workflows/native-image/add-logging.yml'
+      - '.github/workflows/native-image-add-logging.yml'
   schedule:
     - cron: "0 0 1 * *" # run every month
   workflow_dispatch:
diff --git a/.github/workflows/native-image/build-from-jar.yml b/.github/workflows/native-image-build-from-jar.yml
similarity index 87%
rename from .github/workflows/native-image/build-from-jar.yml
rename to .github/workflows/native-image-build-from-jar.yml
index 86b53f526..a52bdeff7 100644
--- a/.github/workflows/native-image/build-from-jar.yml
+++ b/.github/workflows/native-image-build-from-jar.yml
@@ -3,11 +3,11 @@ on:
   push:
     paths:
       - 'native-image/build-from-jar/**'
-      - '.github/workflows/native-image/build-from-jar.yml'
+      - '.github/workflows/native-image-build-from-jar.yml'
   pull_request:
     paths:
       - 'native-image/build-from-jar/**'
-      - '.github/workflows/native-image/build-from-jar.yml'
+      - '.github/workflows/native-image-build-from-jar.yml'
   schedule:
     - cron: "0 0 1 * *" # run every month
   workflow_dispatch:
diff --git a/.github/workflows/native-image/build-java-modules.yml b/.github/workflows/native-image-build-java-modules.yml
similarity index 87%
rename from .github/workflows/native-image/build-java-modules.yml
rename to .github/workflows/native-image-build-java-modules.yml
index 2654b23ca..da03e922b 100644
--- a/.github/workflows/native-image/build-java-modules.yml
+++ b/.github/workflows/native-image-build-java-modules.yml
@@ -3,11 +3,11 @@ on:
   push:
     paths:
       - 'native-image/build-java-modules/**'
-      - '.github/workflows/native-image/build-java-modules.yml'
+      - '.github/workflows/native-image-build-java-modules.yml'
   pull_request:
     paths:
       - 'native-image/build-java-modules/**'
-      - '.github/workflows/native-image-build/java-modules.yml'
+      - '.github/workflows/native-image-build-java-modules.yml'
   schedule:
     - cron: "0 0 1 * *" # run every month
   workflow_dispatch:
diff --git a/.github/workflows/native-image/build-shared-library.yml b/.github/workflows/native-image-build-shared-library.yml
similarity index 87%
rename from .github/workflows/native-image/build-shared-library.yml
rename to .github/workflows/native-image-build-shared-library.yml
index b3d13ddca..8505852e8 100644
--- a/.github/workflows/native-image/build-shared-library.yml
+++ b/.github/workflows/native-image-build-shared-library.yml
@@ -3,11 +3,11 @@ on:
   push:
     paths:
       - 'native-image/build-shared-library/**'
-      - '.github/workflows/native-image/build-shared-library.yml'
+      - '.github/workflows/native-image-build-shared-library.yml'
   pull_request:
     paths:
       - 'native-image/build-shared-library/**'
-      - '.github/workflows/native-image/build-shared-library.yml'
+      - '.github/workflows/native-image-build-shared-library.yml'
   schedule:
     - cron: "0 0 1 * *" # run every month
   workflow_dispatch:
diff --git a/.github/workflows/native-image/build-static-images.yml b/.github/workflows/native-image-build-static-images.yml
similarity index 92%
rename from .github/workflows/native-image/build-static-images.yml
rename to .github/workflows/native-image-build-static-images.yml
index 3e5ae7583..149f9ef1c 100644
--- a/.github/workflows/native-image/build-static-images.yml
+++ b/.github/workflows/native-image-build-static-images.yml
@@ -3,11 +3,11 @@ on:
   push:
     paths:
       - 'native-image/build-static-images/**'
-      - '.github/workflows/native-image/build-static-images.yml'
+      - '.github/workflows/native-image-build-static-images.yml'
   pull_request:
     paths:
       - 'native-image/build-static-images/**'
-      - '.github/workflows/native-image/build-static-images.yml'
+      - '.github/workflows/native-image-build-static-images.yml'
   schedule:
     - cron: "0 0 1 * *" # run every month
   workflow_dispatch:
diff --git a/.github/workflows/native-image/build-with-js-embedded.yml b/.github/workflows/native-image-build-with-js-embedded.yml
similarity index 86%
rename from .github/workflows/native-image/build-with-js-embedded.yml
rename to .github/workflows/native-image-build-with-js-embedded.yml
index 5f8f37425..ecef55ea6 100644
--- a/.github/workflows/native-image/build-with-js-embedded.yml
+++ b/.github/workflows/native-image-build-with-js-embedded.yml
@@ -3,11 +3,11 @@ on:
   push:
     paths:
       - 'native-image/build-with-js-embedded/**'
-      - '.github/workflows/native-image/build-with-js-embedded.yml'
+      - '.github/workflows/native-image-build-with-js-embedded.yml'
   pull_request:
     paths:
       - 'native-image/build-with-js-embedded/**'
-      - '.github/workflows/native-image/build-with-js-embedded.yml'
+      - '.github/workflows/native-image-build-with-js-embedded.yml'
   schedule:
     - cron: "0 0 1 * *" # run every month
   workflow_dispatch:
diff --git a/.github/workflows/native-image/configure-with-tracing-agent.yml b/.github/workflows/native-image-configure-with-tracing-agent.yml
similarity index 88%
rename from .github/workflows/native-image/configure-with-tracing-agent.yml
rename to .github/workflows/native-image-configure-with-tracing-agent.yml
index 9dc74fa09..8ff6b1c4b 100644
--- a/.github/workflows/native-image/configure-with-tracing-agent.yml
+++ b/.github/workflows/native-image-configure-with-tracing-agent.yml
@@ -3,11 +3,11 @@ on:
   push:
     paths:
       - 'native-image/configure-with-tracing-agent/**'
-      - '.github/workflows/native-image/configure-with-tracing-agent.yml'
+      - '.github/workflows/native-image-configure-with-tracing-agent.yml'
   pull_request:
     paths:
       - 'native-image/configure-with-tracing-agent/**'
-      - '.github/workflows/native-image/configure-with-tracing-agent.yml'
+      - '.github/workflows/native-image-configure-with-tracing-agent.yml'
   schedule:
     - cron: "0 0 1 * *" # run every month
   workflow_dispatch:
diff --git a/README.md b/README.md
index c29001a0f..e1d3ee35b 100644
--- a/README.md
+++ b/README.md
@@ -36,7 +36,7 @@ cd graalvm-demos
       <td align="left" width="70%">Demonstrates how to generate a native executable using the Native Build Tools Maven plugin <br><strong>Technologies: </strong>Native Image, Native Build Tools Maven plugin<br><strong>Reference: </strong><a href="https://docs.oracle.com/en/graalvm/jdk/21/docs/getting-started/oci/code-editor/">Oracle GraalVM in OCI Code Editor</a></td>
     </tr>
     <tr>
-      <td align="left" width="30%"><a href="/native-hello-module/">native-hello-module</a><br><a href="https://github.com/graalvm/graalvm-demos/actions/workflows/native-hello-module.yml"><img alt="native-hello-module" src="https://github.com/graalvm/graalvm-demos/actions/workflows/native-hello-module.yml/badge.svg" /></a></td>
+      <td align="left" width="30%"><a href="/native-image/build-java-modules/">native-image/build-java-modules</a><br><a href="https://github.com/graalvm/graalvm-demos/actions/workflows/native-image-build-java-modules.yml"><img alt="build-java-modules" src="https://github.com/graalvm/graalvm-demos/actions/workflows/native-image-build-java-modules.yml/badge.svg" /></a></td>
       <td align="left" width="70%">Demonstrates how to build a modular Java application into a native executable<br><strong>Technologies: </strong>Native Image, Maven<br><strong>Reference: </strong><a href="https://www.graalvm.org/dev/reference-manual/native-image/guides/build-java-modules-into-native-executable/">Build Java Modules into a Native Executable</a></td>
     </tr>
     <tr>
@@ -72,23 +72,23 @@ cd graalvm-demos
       <td align="left" width="70%">Demonstrates how to debug a Java application, built into a native executable in VS Code<br><strong>Technologies: </strong>Native Image, Maven, GraalVM Tools for Java<br><strong>Reference: </strong><a href="https://medium.com/graalvm/native-image-debugging-in-vs-code-2d5dda1989c1">Native Image Debugging in VS Code</a></td>
     </tr>
     <tr>
-      <td align="left" width="30%"><a href="/native-image-logging-examples/">native-image-logging-examples</a><br><a href="https://github.com/graalvm/graalvm-demos/blob/ni-logging-demo/.github/workflows/native-image-logging-examples.yml"><img alt="native-image-logging-examples" src="https://github.com/graalvm/graalvm-demos/actions/workflows/native-image-logging-examples.yml/badge.svg" /></a></td>
+      <td align="left" width="30%"><a href="/native-image/add-logging/">native-image/add-logging</a><br><a href="https://github.com/graalvm/graalvm-demos/blob/ni-logging-demo/.github/workflows/native-image-add-logging.yml"><img alt="add-logging" src="https://github.com/graalvm/graalvm-demos/actions/workflows/native-image-add-logging.yml/badge.svg" /></a></td>
       <td align="left" width="70%">Demonstrates how to initialize Loggers with Native Image at the executable build or run time<br><strong>Technologies: </strong> Native Image<br><strong>Reference: </strong><a href="https://www.graalvm.org/latest/reference-manual/native-image/guides/add-logging-to-native-executable/">Add Logging to a Native Executable</a></td>
     </tr>
     <tr>
-      <td align="left" width="30%"><a href="/native-jfr-demo/">native-jfr-demo</a><br><a href="https://github.com/graalvm/graalvm-demos/actions/workflows/ni-native-executable-jfr-demo/.github/workflows/native-jfr-demo.yml"><img alt="native-jfr-demo" src="https://github.com/graalvm/graalvm-demos/actions/workflows/native-jfr-demo.yml/badge.svg"/></a></td>
+      <td align="left" width="30%"><a href="/native-image/add-jfr/">native-image/add-jfr</a><br><a href="https://github.com/graalvm/graalvm-demos/actions/workflows/ni-native-executable-jfr-demo/.github/workflows/native-image-add-jfr.yml"><img alt="add-jfr" src="https://github.com/graalvm/graalvm-demos/actions/workflows/native-image-add-jfr.yml/badge.svg"/></a></td>
       <td align="left" width="70%">Demonstrates how to create a custom JDK Flight Recorder (JFR) event and use that in a native executable<br><strong>Technologies: </strong> Native Image, JFR, VisualVM <br><strong>Reference: </strong><a href="https://www.graalvm.org/latest/reference-manual/native-image/guides/build-and-run-native-executable-with-jfr/">Build and Run Native Executables with JFR</a></td>
     </tr>
     <tr>
-      <td align="left" width="30%"><a href="/native-shared-library/">native-shared-library</a><br><a href="https://github.com/graalvm/graalvm-demos/actions/workflows/native-shared-library.yml"><img alt="native-shared-library" src="https://github.com/graalvm/graalvm-demos/actions/workflows/native-shared-library.yml/badge.svg"/></a></td>
+      <td align="left" width="30%"><a href="/native-image/build-shared-library/">native-image/build-shared-library</a><br><a href="https://github.com/graalvm/graalvm-demos/actions/workflows/native-image-build-shared-library.yml"><img alt="build-shared-library" src="https://github.com/graalvm/graalvm-demos/actions/workflows/native-image-build-shared-library.yml/badge.svg"/></a></td>
       <td align="left" width="70%">Demonstrates how to create a Java class library, use Native Image to create a native shared library, and then create a small C application that uses that shared library<br><strong>Technologies: </strong> Native Image, LLVM toolchain <br><strong>Reference: </strong><a href="https://www.graalvm.org/latest/reference-manual/native-image/guides/build-native-shared-library/">Build a Native Shared Library</a></td>
-    </tr>  
+    </tr>
     <tr>
-      <td align="left" width="30%"><a href="/native-image-reflection-example/">native-image-reflection-example</a><br><a href="https://github.com/graalvm/graalvm-demos/actions/workflows/native-image-reflection-example.yml"><img alt="native-image-reflection-example" src="https://github.com/graalvm/graalvm-demos/actions/workflows/native-image-reflection-example.yml/badge.svg"/></a></td>
+      <td align="left" width="30%"><a href="/native-image/configure-with-tracing-agent/">native-image/configure-with-tracing-agent</a><br><a href="https://github.com/graalvm/graalvm-demos/actions/workflows/native-image-configure-with-tracing-agent.yml"><img alt="configure-with-tracing-agent" src="https://github.com/graalvm/graalvm-demos/actions/workflows/native-image-configure-with-tracing-agent.yml/badge.svg"/></a></td>
       <td align="left" width="70%">Demonstrates how to provide metadata for Native Image in the form of JSON configuration files using a tracing agent<br><strong>Technologies: </strong> Native Image</td>
-    </tr>  
+    </tr>
     <tr>
-      <td align="left" width="30%"><a href="/native-static-images/">native-static-images</a><br><a href="https://github.com/graalvm/graalvm-demos/actions/workflows/native-static-images.yml"><img alt="native-static-images" src="https://github.com/graalvm/graalvm-demos/actions/workflows/native-static-images.yml/badge.svg"/></a></td>
+      <td align="left" width="30%"><a href="/native-image/build-static-images/">native-image/build-static-images</a><br><a href="https://github.com/graalvm/graalvm-demos/actions/workflows/native-image-build-static-images.yml"><img alt="build-static-images" src="https://github.com/graalvm/graalvm-demos/actions/workflows/native-image-build-static-images.yml/badge.svg"/></a></td>
       <td align="left" width="70%">Demonstrates how to build a fully static and a mostly-static native executable.<br><strong>Technologies: </strong> Native Image <br><strong>Reference: </strong><a href="https://www.graalvm.org/latest/reference-manual/native-image/guides/build-static-executables/">Build a Statically Linked or Mostly-Statically Linked Native Executable</a></td>
     </tr>
     <tr>
@@ -96,7 +96,7 @@ cd graalvm-demos
       <td align="left" width="70%">Demonstrates different ways to generate a heap dump from a running native executable.<br><strong>Technologies: </strong> Native Image, VisualVM <br><strong>Reference: </strong><a href="https://www.graalvm.org/latest/reference-manual/native-image/guides/create-heap-dump/">Create a Heap Dump from a Native Executable</a></td>
     </tr>  
     <tr>
-      <td align="left" width="30%"><a href="/native-image-jmx-demo/">native-image-jmx-demo</a><br><a href="https://github.com/graalvm/graalvm-demos/actions/workflows/native-image-jmx-demo.yml"><img alt="nnative-image-jmx-demo" src="https://github.com/graalvm/graalvm-demos/actions/workflows/native-image-jmx-demo.yml/badge.svg"/></a></td>
+      <td align="left" width="30%"><a href="/native-image/add-jmx/">native-image/add-jmx</a><br><a href="https://github.com/graalvm/graalvm-demos/actions/workflows/native-image-add-jmx.yml"><img alt="add-jmx" src="https://github.com/graalvm/graalvm-demos/actions/workflows/native-image-add-jmx.yml/badge.svg"/></a></td>
       <td align="left" width="70%">This demo covers the steps required to build, run, and interact with a native executable using JMX.<br><strong>Technologies: </strong> Native Image, JMX, VisualVM <br><strong>Reference: </strong><a href="https://www.graalvm.org/dev/reference-manual/native-image/guides/build-and-run-native-executable-with-remote-jmx/">Build and Run Native Executables with Remote JMX</a></td>
     </tr>
   </tbody>
diff --git a/native-image/configure-with-tracing-agent/run.sh b/native-image/configure-with-tracing-agent/run.sh
index 360fbedac..ff4c63914 100755
--- a/native-image/configure-with-tracing-agent/run.sh
+++ b/native-image/configure-with-tracing-agent/run.sh
@@ -4,9 +4,6 @@ set -ex
 javac ReflectionExample.java
 java ReflectionExample StringReverser reverse "hello"
 java ReflectionExample StringCapitalizer capitalize "hello"
-native-image -Ob ReflectionExample
-./reflectionexample StringReverser reverse "hello"
-./reflectionexample StringCapitalizer capitalize "hello"
 mkdir -p META-INF/native-image
 java -agentlib:native-image-agent=config-output-dir=META-INF/native-image ReflectionExample StringReverser reverse "hello"
 java -agentlib:native-image-agent=config-merge-dir=META-INF/native-image ReflectionExample StringCapitalizer capitalize "hello"