diff --git a/Makefile b/Makefile
index 91389f9..872f9e1 100644
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,7 @@ help: ## Show issue core capability help
 	@echo "  test-verbose                 Run tests with verbose output"
 	@echo "  package                      Build source and wheel distributions"
 	@echo "  package-check                Build and validate distributions"
-	@echo "  publish-gitea                Publish distributions to Gitea PyPI"
+	@echo "  publish-gitea                Legacy alias: publish to old Gitea PyPI URL (prefer publish-forgejo)"
 	@echo ""
 	@echo "Feedback & Continuous Improvement:"
 	@echo "  feedback MSG=\"...\"            Submit feedback about issue-core"
@@ -148,7 +148,7 @@ endif
 	issue backend set local
 
 .PHONY: issue-backend-set-gitea
-issue-backend-set-gitea: ## Configure Gitea backend (requires REPO=repository-name)
+issue-backend-set-gitea: ## Configure Forgejo backend (type string gitea; requires REPO=repository-name)
 ifndef ISSUE_CLI
 	@echo "❌ Issue facade not installed"
 	@exit 1
@@ -230,7 +230,7 @@ package-check: package ## Build and validate source/wheel distributions
 	$(PYTHON) -m twine check dist/*
 
 .PHONY: publish-gitea
-publish-gitea: package-check ## Publish distributions to the Coulomb Gitea PyPI registry
+publish-gitea: package-check ## Legacy: publish to the old Coulomb Gitea PyPI URL (prefer publish-forgejo)
 ifndef TWINE_USERNAME
 	$(error TWINE_USERNAME is required)
 endif
@@ -320,7 +320,7 @@ issue-core-demo: ## Demonstrate facade functionality
 	@echo "The Issue Core provides a unified CLI for issue tracking across:"
 	@echo "  • GitHub Issues"
 	@echo "  • GitLab Issues"
-	@echo "  • Gitea Issues"
+	@echo "  • Forgejo Issues"
 	@echo "  • Local SQLite storage"
 	@echo ""
 	@echo "Key features:"
@@ -350,8 +350,8 @@ issue-detect-repo: ## Detect and configure backend for current repository
 			echo "🐙 GitHub remote detected"; \
 		elif git remote -v 2>/dev/null | grep -q gitlab; then \
 			echo "🦊 GitLab remote detected"; \
-		elif git remote -v 2>/dev/null | grep -q gitea; then \
-			echo "🦋 Gitea remote detected"; \
+		elif git remote -v 2>/dev/null | grep -qE 'forgejo|gitea'; then \
+			echo "🦋 Forgejo remote detected"; \
 		else \
 			echo "📁 Generic git repository - local backend recommended"; \
 		fi; \
@@ -395,7 +395,7 @@ capability-info: ## Show capability information
 	@echo "Description: $(CAPABILITY_DESCRIPTION)"
 	@echo "Type: CLI application with backend facade pattern"
 	@echo "Main command: issue"
-	@echo "Supported backends: Local SQLite, GitHub, GitLab, Gitea"
+	@echo "Supported backends: Local SQLite, Forgejo, GitHub, GitLab"
 	@echo "Key features: Repository-aware, offline-capable, unified interface"
 	@echo "Targets:"
 	@$(MAKE) --no-print-directory help | grep "^  " | sed 's/^  /    /'
diff --git a/registry/capabilities/capability.infotech.issue-tracking.md b/registry/capabilities/capability.infotech.issue-tracking.md
index bc2ccb3..1efc9e5 100644
--- a/registry/capabilities/capability.infotech.issue-tracking.md
+++ b/registry/capabilities/capability.infotech.issue-tracking.md
@@ -49,7 +49,7 @@ discovery:
   intent: Project and operate on external issue trackers with a stable link to
     work-record UUIDs; never replace file-first work records as coordination substrate.
   includes:
-  - unified Python API and CLI over Gitea/SQLite issue operations
+  - unified Python API and CLI over Forgejo/SQLite issue operations
   - work_record_issue_map store + project/map/push-status
   - local offline cache and backend sync
   - credential handling via environment variables