diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index c12f0ff..675ee3b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -81,7 +81,7 @@ jobs:
           cat > release_notes.md << EOF
           Template release ${{ steps.get_tag.outputs.new_version }}
 
-          Updated specification-driven development templates for GitHub Copilot, Claude Code, Gemini CLI, Cursor, Qwen, opencode, and Windsurf.
+          Updated specification-driven development templates for GitHub Copilot, Claude Code, Gemini CLI, Cursor, Qwen, opencode, Windsurf, and Codex.
 
           Now includes per-script variants for POSIX shell (sh) and PowerShell (ps).
 
@@ -100,6 +100,8 @@ jobs:
           - spec-kit-template-qwen-ps-${{ steps.get_tag.outputs.new_version }}.zip
           - spec-kit-template-windsurf-sh-${{ steps.get_tag.outputs.new_version }}.zip
           - spec-kit-template-windsurf-ps-${{ steps.get_tag.outputs.new_version }}.zip
+          - spec-kit-template-codex-sh-${{ steps.get_tag.outputs.new_version }}.zip
+          - spec-kit-template-codex-ps-${{ steps.get_tag.outputs.new_version }}.zip
           EOF
           
           echo "Generated release notes:"
@@ -126,6 +128,8 @@ jobs:
             spec-kit-template-qwen-ps-${{ steps.get_tag.outputs.new_version }}.zip \
             spec-kit-template-windsurf-sh-${{ steps.get_tag.outputs.new_version }}.zip \
             spec-kit-template-windsurf-ps-${{ steps.get_tag.outputs.new_version }}.zip \
+            spec-kit-template-codex-sh-${{ steps.get_tag.outputs.new_version }}.zip \
+            spec-kit-template-codex-ps-${{ steps.get_tag.outputs.new_version }}.zip \
             --title "Spec Kit Templates - $VERSION_NO_V" \
             --notes-file release_notes.md
         env:
diff --git a/.github/workflows/scripts/create-release-packages.sh b/.github/workflows/scripts/create-release-packages.sh
index 8d7eaf2..05b5cce 100644
--- a/.github/workflows/scripts/create-release-packages.sh
+++ b/.github/workflows/scripts/create-release-packages.sh
@@ -6,7 +6,7 @@ set -euo pipefail
 # Usage: .github/workflows/scripts/create-release-packages.sh <version>
 #   Version argument should include leading 'v'.
 #   Optionally set AGENTS and/or SCRIPTS env vars to limit what gets built.
-#     AGENTS  : space or comma separated subset of: claude gemini copilot qwen opencode (default: all)
+#     AGENTS  : space or comma separated subset of: claude gemini copilot cursor qwen opencode windsurf codex (default: all)
 #     SCRIPTS : space or comma separated subset of: sh ps (default: both)
 #   Examples:
 #     AGENTS=claude SCRIPTS=sh $0 v0.2.0
@@ -157,13 +157,16 @@ build_variant() {
     windsurf)
       mkdir -p "$base_dir/.windsurf/workflows"
       generate_commands windsurf md "\$ARGUMENTS" "$base_dir/.windsurf/workflows" "$script" ;;
+    codex)
+      mkdir -p "$base_dir/.codex/commands"
+      generate_commands codex md "\$ARGUMENTS" "$base_dir/.codex/commands" "$script" ;;
   esac
   ( cd "$base_dir" && zip -r "../spec-kit-template-${agent}-${script}-${NEW_VERSION}.zip" . )
   echo "Created spec-kit-template-${agent}-${script}-${NEW_VERSION}.zip"
 }
 
 # Determine agent list
-ALL_AGENTS=(claude gemini copilot cursor qwen opencode windsurf)
+ALL_AGENTS=(claude gemini copilot cursor qwen opencode windsurf codex)
 ALL_SCRIPTS=(sh ps)