diff --git a/internal-packages/workflow-designer-ui/src/editor/properties-panel/trigger-node-properties-panel/providers/github-trigger/components/labels-input-step.tsx b/internal-packages/workflow-designer-ui/src/editor/properties-panel/trigger-node-properties-panel/providers/github-trigger/components/labels-input-step.tsx
index c0fbfe5b27..314b2639fd 100644
--- a/internal-packages/workflow-designer-ui/src/editor/properties-panel/trigger-node-properties-panel/providers/github-trigger/components/labels-input-step.tsx
+++ b/internal-packages/workflow-designer-ui/src/editor/properties-panel/trigger-node-properties-panel/providers/github-trigger/components/labels-input-step.tsx
@@ -10,26 +10,41 @@ interface LabelsInputStepProps {
 	eventId: GitHubTriggerEventId;
 	owner: string;
 	repo: string;
+	initialLabels?: string[];
 	onBack: () => void;
 	onSubmit: (
 		e: FormEvent<HTMLFormElement>,
 		rawLabels: { id: number; value: string }[],
 	) => void;
+	errorMessage?: string;
 	isPending: boolean;
-	labelsError: string | null;
+	showBackButton?: boolean;
 }
 
 export function LabelsInputStep({
 	eventId,
 	owner,
 	repo,
+	initialLabels,
 	onBack,
 	onSubmit,
+	errorMessage,
 	isPending,
-	labelsError,
+	showBackButton = true,
 }: LabelsInputStepProps) {
-	const [labels, setLabels] = useState([{ id: 1, value: "" }]);
-	const [nextId, setNextId] = useState(2);
+	const [labels, setLabels] = useState(() =>
+		initialLabels !== undefined && initialLabels.length > 0
+			? initialLabels.map((value, index) => ({
+					id: index + 1,
+					value,
+				}))
+			: [{ id: 1, value: "" }],
+	);
+	const [nextId, setNextId] = useState(
+		initialLabels !== undefined && initialLabels.length > 0
+			? initialLabels.length + 1
+			: 2,
+	);
 
 	return (
 		<form
@@ -71,12 +86,12 @@ export function LabelsInputStep({
 									)
 								}
 								className={clsx(
-									"flex-1 rounded-[8px] py-[8px] px-[12px] outline-none focus:outline-none",
-									labelsError
-										? "border border-red-500 focus:border-red-400"
+									"flex-1 rounded-[8px] py-[8px] px-[12px] outline-none focus:outline-none text-[14px] bg-transparent",
+									errorMessage !== undefined
+										? "border border-[#FF3D71] focus:border-[#FF3D71]"
 										: "border border-white-400 focus:border-border",
-									"text-[14px] bg-transparent",
 								)}
+								required={true}
 								placeholder="bug"
 							/>
 							{labels.length > 1 && (
@@ -93,14 +108,15 @@ export function LabelsInputStep({
 							)}
 						</div>
 					))}
-					{labelsError ? (
-						<p className="text-[12px] text-red-400 pl-2">{labelsError}</p>
-					) : (
-						<p className="text-[12px] text-inverse pl-2">
-							Labels are required for issue labeled triggers. Examples: bug,
-							feature, urgent
+					{errorMessage !== undefined && (
+						<p className="text-[12px] text-[#FF3D71] pl-2" role="alert">
+							{errorMessage}
 						</p>
 					)}
+					<p className="text-[12px] text-inverse pl-2">
+						Labels are required for issue labeled triggers. Examples: bug,
+						feature, urgent
+					</p>
 					<button
 						type="button"
 						onClick={() => {
@@ -116,17 +132,22 @@ export function LabelsInputStep({
 			</fieldset>
 
 			<div className="pt-[8px] flex gap-[8px] mt-[12px] px-[4px]">
-				<button
-					type="button"
-					className="flex-1 bg-bg-700 hover:bg-bg-600 text-inverse font-medium px-4 py-2 rounded-md text-[14px] transition-colors disabled:opacity-50 relative"
-					onClick={onBack}
-					disabled={isPending}
-				>
-					<span className={isPending ? "opacity-0" : ""}>Back</span>
-				</button>
+				{showBackButton && (
+					<button
+						type="button"
+						className="flex-1 bg-bg-700 hover:bg-bg-600 text-inverse font-medium px-4 py-2 rounded-md text-[14px] transition-colors disabled:opacity-50 relative"
+						onClick={onBack}
+						disabled={isPending}
+					>
+						<span className={isPending ? "opacity-0" : ""}>Back</span>
+					</button>
+				)}
 				<button
 					type="submit"
-					className="flex-1 bg-primary-900 hover:bg-primary-800 text-inverse font-medium px-4 py-2 rounded-md text-[14px] transition-colors disabled:opacity-50 relative"
+					className={clsx(
+						"bg-primary-900 hover:bg-primary-800 text-inverse font-medium px-4 py-2 rounded-md text-[14px] transition-colors disabled:opacity-50 relative",
+						showBackButton ? "flex-1" : "w-full",
+					)}
 					disabled={isPending}
 				>
 					<span className={isPending ? "opacity-0" : ""}>
diff --git a/internal-packages/workflow-designer-ui/src/editor/properties-panel/trigger-node-properties-panel/providers/github-trigger/github-trigger-properties-panel.tsx b/internal-packages/workflow-designer-ui/src/editor/properties-panel/trigger-node-properties-panel/providers/github-trigger/github-trigger-properties-panel.tsx
index 996bc3c74c..07e29b16f5 100644
--- a/internal-packages/workflow-designer-ui/src/editor/properties-panel/trigger-node-properties-panel/providers/github-trigger/github-trigger-properties-panel.tsx
+++ b/internal-packages/workflow-designer-ui/src/editor/properties-panel/trigger-node-properties-panel/providers/github-trigger/github-trigger-properties-panel.tsx
@@ -1,35 +1,16 @@
-import {
-	type FlowTriggerId,
-	type GitHubFlowTriggerEvent,
-	type Output,
-	OutputId,
-	type TriggerNode,
-} from "@giselle-sdk/data-type";
-import {
-	type GitHubTriggerEventId,
-	getGitHubDisplayLabel,
-	githubTriggers,
-} from "@giselle-sdk/flow";
+import type { FlowTriggerId, TriggerNode } from "@giselle-sdk/data-type";
+import type { GitHubTriggerEventId } from "@giselle-sdk/flow";
 import type { GitHubIntegrationInstallation } from "@giselle-sdk/giselle";
-import {
-	useFeatureFlag,
-	useGiselleEngine,
-	useIntegration,
-	useWorkflowDesigner,
-} from "@giselle-sdk/giselle/react";
+import { useIntegration } from "@giselle-sdk/giselle/react";
 import clsx from "clsx/lite";
 import { InfoIcon } from "lucide-react";
-import {
-	type FormEvent,
-	type FormEventHandler,
-	useCallback,
-	useState,
-	useTransition,
-} from "react";
+import { type FormEvent, useCallback, useRef, useState } from "react";
 import { Tooltip } from "../../../../../ui/tooltip";
-import { isPromptEmpty as isEmpty } from "../../../../lib/validate-prompt";
 import { SelectRepository } from "../../../ui";
-import { GitHubTriggerConfiguredView } from "../../ui";
+import {
+	GitHubTriggerConfiguredView,
+	type GitHubTriggerReconfigureMode,
+} from "../../ui";
 import { GitHubTriggerReconfiguringView } from "../../ui/reconfiguring-views/github-trigger-reconfiguring-view";
 import { EventSelectionStep } from "./components/event-selection-step";
 import { EventTypeDisplay } from "./components/event-type-display";
@@ -37,11 +18,21 @@ import { InstallGitHubApplication } from "./components/install-application";
 import { LabelsInputStep } from "./components/labels-input-step";
 import { RepositoryDisplay } from "./components/repository-display";
 import { Unauthorized } from "./components/unauthorized";
-import { createTriggerEvent } from "./utils/trigger-configuration";
-import { useTriggerConfiguration } from "./utils/use-trigger-configuration";
+import {
+	type GitHubTriggerSetupStep,
+	resolveNextStep,
+} from "./utils/resolve-next-step";
+import {
+	isTriggerRequiringCallsign,
+	isTriggerRequiringLabels,
+} from "./utils/trigger-configuration";
+import { useConfigureTrigger } from "./utils/use-configure-trigger";
 
 export function GitHubTriggerPropertiesPanel({ node }: { node: TriggerNode }) {
 	const { value } = useIntegration();
+	const reconfigureModeRef = useRef<GitHubTriggerReconfigureMode | undefined>(
+		undefined,
+	);
 	if (value?.github === undefined) {
 		return "unset";
 	}
@@ -51,6 +42,9 @@ export function GitHubTriggerPropertiesPanel({ node }: { node: TriggerNode }) {
 			<GitHubTriggerConfiguredView
 				flowTriggerId={node.content.state.flowTriggerId}
 				node={node}
+				onStartReconfigure={(mode) => {
+					reconfigureModeRef.current = mode;
+				}}
 			/>
 		);
 	} else if (
@@ -63,6 +57,7 @@ export function GitHubTriggerPropertiesPanel({ node }: { node: TriggerNode }) {
 				node={node}
 				installationUrl={value.github.installationUrl}
 				flowTriggerId={node.content.state.flowTriggerId}
+				reconfigureMode={reconfigureModeRef.current}
 			/>
 		);
 	}
@@ -97,69 +92,7 @@ export function GitHubTriggerPropertiesPanel({ node }: { node: TriggerNode }) {
 	}
 }
 
-interface SelectEventStep {
-	state: "select-event";
-}
-
-interface SelectRepositoryStep {
-	state: "select-repository";
-	eventId: GitHubTriggerEventId;
-}
-
-export interface InputCallsignStep {
-	state: "input-callsign";
-	eventId: GitHubTriggerEventId;
-	owner: string;
-	repo: string;
-	repoNodeId: string;
-	installationId: number;
-}
-
-export interface InputLabelsStep {
-	state: "input-labels";
-	eventId: GitHubTriggerEventId;
-	owner: string;
-	repo: string;
-	repoNodeId: string;
-	installationId: number;
-}
-
-interface ConfirmRepositoryStep {
-	state: "confirm-repository";
-	eventId: GitHubTriggerEventId;
-	installationId: number;
-	owner: string;
-	repo: string;
-	repoNodeId: string;
-}
-
-type GitHubTriggerSetupStep =
-	| SelectEventStep
-	| SelectRepositoryStep
-	| InputCallsignStep
-	| InputLabelsStep
-	| ConfirmRepositoryStep;
-
-/**
- * Determines if a trigger type requires a callsign
- */
-function isTriggerRequiringCallsign(eventId: GitHubTriggerEventId): boolean {
-	return [
-		"github.issue_comment.created",
-		"github.pull_request_comment.created",
-		"github.pull_request_review_comment.created",
-	].includes(eventId);
-}
-
-/**
- * Determines if a trigger type requires labels
- */
-function isTriggerRequiringLabels(eventId: GitHubTriggerEventId) {
-	return (
-		eventId === "github.issue.labeled" ||
-		eventId === "github.pull_request.labeled"
-	);
-}
+const DEFAULT_EVENT_ID = "github.issue.created";
 
 export function Installed({
 	installations,
@@ -171,83 +104,61 @@ export function Installed({
 	installations: GitHubIntegrationInstallation[];
 	node: TriggerNode;
 	installationUrl: string;
-	reconfigStep?: SelectRepositoryStep;
+	reconfigStep?: GitHubTriggerSetupStep;
 	flowTriggerId?: FlowTriggerId;
 }) {
-	const { experimental_storage } = useFeatureFlag();
 	const [step, setStep] = useState<GitHubTriggerSetupStep>(
-		reconfigStep ?? { state: "select-event" },
+		reconfigStep ?? { state: "select-event", eventId: DEFAULT_EVENT_ID },
 	);
-	const { data: workspace, updateNodeData } = useWorkflowDesigner();
-	const { configureTrigger, isPending: isTriggerConfigPending } =
-		useTriggerConfiguration({
-			node,
-		});
-	const client = useGiselleEngine();
-	const [isPending, startTransition] = useTransition();
 	const [eventId, setEventId] = useState<GitHubTriggerEventId>(
-		reconfigStep?.eventId ?? "github.issue.created",
+		reconfigStep?.eventId ?? DEFAULT_EVENT_ID,
 	);
-	const [callsignError, setCallsignError] = useState<string | null>(null);
-	const [labelsError, setLabelsError] = useState<string | null>(null);
+	const [callsignError, setCallsignError] = useState<string | undefined>();
+	const [labelsError, setLabelsError] = useState<string | undefined>();
+	const isReconfiguring = node.content.state.status === "reconfiguring";
+	const { configureTrigger, isPending } = useConfigureTrigger({ node });
 
-	// Helper function to create callsign events
-	const createCallsignEvent = useCallback(
-		(
-			eventId: GitHubTriggerEventId,
-			formData: FormData,
-		): GitHubFlowTriggerEvent => {
-			const callsign = formData.get("callsign");
-			if (typeof callsign !== "string" || isEmpty(callsign)) {
-				throw new Error("Invalid callsign: expected a non-empty string.");
+	const handleSubmit = useCallback(
+		(data?: { callsign?: string; labels?: string[] }) => {
+			try {
+				const action = resolveNextStep({
+					currentStep: step,
+					eventId,
+					submissionData: data ?? {},
+					nodeStatus: node.content.state.status,
+				});
+
+				if (action.type === "continue") {
+					setStep(action.nextStep);
+				} else if (action.type === "submit") {
+					configureTrigger({
+						event: action.event,
+						repositoryInfo: action.repositoryInfo,
+						flowTriggerId,
+					});
+				}
+			} catch (error) {
+				console.error(error);
 			}
-			return {
-				id: eventId,
-				conditions: { callsign },
-			} as GitHubFlowTriggerEvent;
 		},
-		[],
+		[step, eventId, node.content.state.status, configureTrigger, flowTriggerId],
 	);
 
-	// Events that require callsign
-	const CALLSIGN_EVENTS = [
-		"github.issue_comment.created",
-		"github.pull_request_comment.created",
-		"github.pull_request_review_comment.created",
-	] as const;
-
-	const handleCallsignSubmit = useCallback<FormEventHandler<HTMLFormElement>>(
-		(e) => {
+	const handleCallsignSubmit = useCallback(
+		(e: FormEvent<HTMLFormElement>) => {
 			e.preventDefault();
-			setCallsignError(null);
-
-			if (step.state !== "input-callsign") {
-				throw new Error("Unexpected state");
-			}
-
-			let event: GitHubFlowTriggerEvent | undefined;
-			const formData = new FormData(e.currentTarget);
-			try {
-				// Create event based on whether it requires callsign
-				if (
-					(CALLSIGN_EVENTS as readonly GitHubTriggerEventId[]).includes(eventId)
-				) {
-					event = createCallsignEvent(eventId, formData);
-				} else {
-					event = createTriggerEvent({ eventId });
-				}
-
-				if (event === undefined) {
-					return;
-				}
-				configureTrigger(event, step);
-			} catch (error) {
+			const callsign = new FormData(e.currentTarget).get("callsign");
+			if (typeof callsign !== "string") return;
+			const normalizedCallsign = callsign.trim();
+			if (normalizedCallsign.length === 0) {
 				setCallsignError(
-					error instanceof Error ? error.message : "Invalid callsign",
+					"Enter a callsign using at least one non-space character.",
 				);
+				return;
 			}
+			handleSubmit({ callsign: normalizedCallsign });
 		},
-		[configureTrigger, step, eventId, CALLSIGN_EVENTS, createCallsignEvent],
+		[handleSubmit],
 	);
 
 	const handleLabelsSubmit = useCallback(
@@ -256,25 +167,16 @@ export function Installed({
 			rawLabels: { id: number; value: string }[],
 		) => {
 			e.preventDefault();
-			setLabelsError(null);
-
-			if (step.state !== "input-labels") {
-				throw new Error("Unexpected state");
-			}
-
-			const validLabels = rawLabels
+			const labels = rawLabels
 				.map((label) => label.value.trim())
 				.filter((value) => value.length > 0);
-
-			if (validLabels.length === 0) {
-				setLabelsError("At least one label is required");
+			if (labels.length === 0) {
+				setLabelsError("Add at least one label using non-space characters.");
 				return;
 			}
-
-			const event = createTriggerEvent({ eventId, labels: validLabels });
-			configureTrigger(event, step);
+			handleSubmit({ labels });
 		},
-		[configureTrigger, step, eventId],
+		[handleSubmit],
 	);
 
 	return (
@@ -314,8 +216,11 @@ export function Installed({
 									owner: value.owner,
 									repo: value.repo,
 									repoNodeId: value.repoNodeId,
+									callsign: step.callsign,
+									labels: step.labels,
 								});
 							}}
+							initialInstallationId={step.installationId}
 						/>
 					</div>
 				</div>
@@ -341,6 +246,9 @@ export function Installed({
 									setStep({
 										state: "select-repository",
 										eventId: step.eventId,
+										callsign: step.callsign,
+										labels: step.labels,
+										installationId: step.installationId,
 									});
 								}}
 								disabled={isPending}
@@ -351,99 +259,9 @@ export function Installed({
 								type="button"
 								className="flex-1 bg-primary-900 hover:bg-primary-800 text-inverse font-medium px-4 py-2 rounded-md text-[14px] transition-colors disabled:opacity-50 relative"
 								onClick={() => {
-									if (
-										isTriggerRequiringCallsign(step.eventId) &&
-										node.content.state.status === "unconfigured"
-									) {
-										setStep({
-											state: "input-callsign",
-											eventId: step.eventId,
-											installationId: step.installationId,
-											owner: step.owner,
-											repo: step.repo,
-											repoNodeId: step.repoNodeId,
-										});
-									} else if (isTriggerRequiringLabels(step.eventId)) {
-										setStep({
-											state: "input-labels",
-											eventId: step.eventId,
-											installationId: step.installationId,
-											owner: step.owner,
-											repo: step.repo,
-											repoNodeId: step.repoNodeId,
-										});
-									} else {
-										startTransition(async () => {
-											try {
-												const trigger = githubTriggers[step.eventId];
-												const outputs: Output[] = [];
-
-												for (const key of trigger.event.payloads.keyof()
-													.options) {
-													outputs.push({
-														id: OutputId.generate(),
-														label: getGitHubDisplayLabel({
-															eventId: step.eventId,
-															accessor: key,
-														}),
-														accessor: key,
-													});
-												}
-
-												let triggerId: FlowTriggerId;
-												if (
-													node.content.state.status === "reconfiguring" &&
-													flowTriggerId !== undefined
-												) {
-													const result = await client.reconfigureGitHubTrigger({
-														flowTriggerId,
-														repositoryNodeId: step.repoNodeId,
-														installationId: step.installationId,
-														useExperimentalStorage: experimental_storage,
-													});
-													triggerId = result.triggerId;
-												} else {
-													const event = createTriggerEvent({
-														eventId: step.eventId,
-													});
-													const result = await client.configureTrigger({
-														trigger: {
-															nodeId: node.id,
-															workspaceId: workspace?.id,
-															enable: false,
-															configuration: {
-																provider: "github",
-																repositoryNodeId: step.repoNodeId,
-																installationId: step.installationId,
-																event,
-															},
-														},
-														useExperimentalStorage: experimental_storage,
-													});
-													triggerId = result.triggerId;
-												}
-
-												updateNodeData(node, {
-													content: {
-														...node.content,
-														state: {
-															status: "configured",
-															flowTriggerId: triggerId,
-														},
-													},
-													outputs:
-														node.outputs.length > 0 ? node.outputs : outputs,
-													name:
-														node.content.state.status === "reconfiguring"
-															? node.name
-															: `On ${trigger.event.label}`,
-												});
-											} catch (_error) {
-												// Error is handled by the UI state
-											}
-										});
-									}
+									handleSubmit();
 								}}
+								disabled={isPending}
 							>
 								<span className={isPending ? "opacity-0" : ""}>
 									{isTriggerRequiringCallsign(step.eventId) ||
@@ -486,7 +304,9 @@ export function Installed({
 			{step.state === "input-callsign" && (
 				<form
 					className="w-full flex flex-col gap-[8px] overflow-y-auto flex-1 pr-2 custom-scrollbar"
-					onSubmit={handleCallsignSubmit}
+					onSubmit={(e) => {
+						handleCallsignSubmit(e);
+					}}
 				>
 					<p className="text-[14px] text-[#F7F9FD] mb-2">Event type</p>
 					<EventTypeDisplay eventId={step.eventId} showDescription={false} />
@@ -522,51 +342,61 @@ export function Installed({
 								type="text"
 								name="callsign"
 								className={clsx(
-									"group w-full flex justify-between items-center rounded-[8px] py-[8px] pl-[28px] pr-[4px] outline-none focus:outline-none",
-									callsignError
-										? "border border-red-500 focus:border-red-400"
+									"group w-full flex justify-between items-center rounded-[8px] py-[8px] pl-[28px] pr-[4px] outline-none focus:outline-none text-[14px] bg-transparent",
+									callsignError !== undefined
+										? "border border-[#FF3D71] focus:border-[#FF3D71]"
 										: "border border-white-400 focus:border-border",
-									"text-[14px] bg-transparent",
 								)}
+								defaultValue={step.callsign ?? ""}
+								required={true}
 								placeholder="code-review"
 							/>
 						</div>
-						{callsignError ? (
-							<p className="text-[12px] text-red-400 pl-2">{callsignError}</p>
-						) : (
-							<p className="text-[12px] text-inverse pl-2">
-								A callsign is required for issue comment triggers. Examples:
-								/code-review, /check-policy
+						{callsignError !== undefined && (
+							<p className="text-[12px] text-[#FF3D71] pl-2" role="alert">
+								{callsignError}
 							</p>
 						)}
+						<p className="text-[12px] text-inverse pl-2">
+							A callsign is required for issue comment triggers. Examples:
+							/code-review, /check-policy
+						</p>
 					</fieldset>
 
 					<div className="pt-[8px] flex gap-[8px] mt-[12px] px-[4px]">
-						<button
-							type="button"
-							className="flex-1 bg-bg-700 hover:bg-bg-600 text-inverse font-medium px-4 py-2 rounded-md text-[14px] transition-colors disabled:opacity-50 relative"
-							onClick={() => {
-								setCallsignError(null);
-								setStep({
-									state: "select-repository",
-									eventId: step.eventId,
-								});
-							}}
-							disabled={isTriggerConfigPending}
-						>
-							<span className={isTriggerConfigPending ? "opacity-0" : ""}>
-								Back
-							</span>
-						</button>
+						{!isReconfiguring && (
+							<button
+								type="button"
+								className="flex-1 bg-bg-700 hover:bg-bg-600 text-inverse font-medium px-4 py-2 rounded-md text-[14px] transition-colors disabled:opacity-50 relative"
+								onClick={() => {
+									setCallsignError(undefined);
+									setStep({
+										state: "confirm-repository",
+										eventId: step.eventId,
+										installationId: step.installationId,
+										owner: step.owner,
+										repo: step.repo,
+										repoNodeId: step.repoNodeId,
+										callsign: step.callsign,
+									});
+								}}
+								disabled={isPending}
+							>
+								<span className={isPending ? "opacity-0" : ""}>Back</span>
+							</button>
+						)}
 						<button
 							type="submit"
-							className="flex-1 bg-primary-900 hover:bg-primary-800 text-inverse font-medium px-4 py-2 rounded-md text-[14px] transition-colors disabled:opacity-50 relative"
-							disabled={isTriggerConfigPending}
+							className={clsx(
+								"bg-primary-900 hover:bg-primary-800 text-inverse font-medium px-4 py-2 rounded-md text-[14px] transition-colors disabled:opacity-50 relative",
+								isReconfiguring ? "w-full" : "flex-1",
+							)}
+							disabled={isPending}
 						>
-							<span className={isTriggerConfigPending ? "opacity-0" : ""}>
-								{isTriggerConfigPending ? "Setting up..." : "Set Up"}
+							<span className={isPending ? "opacity-0" : ""}>
+								{isPending ? "Setting up..." : "Set Up"}
 							</span>
-							{isTriggerConfigPending && (
+							{isPending && (
 								<span className="absolute inset-0 flex items-center justify-center">
 									<svg
 										className="animate-spin h-5 w-5 text-inverse"
@@ -602,16 +432,24 @@ export function Installed({
 					eventId={step.eventId}
 					owner={step.owner}
 					repo={step.repo}
+					initialLabels={step.labels}
+					errorMessage={labelsError}
 					onBack={() => {
-						setLabelsError(null);
+						setLabelsError(undefined);
 						setStep({
-							state: "select-repository",
+							state: "confirm-repository",
 							eventId: step.eventId,
+							installationId: step.installationId,
+							owner: step.owner,
+							repo: step.repo,
+							repoNodeId: step.repoNodeId,
+							labels: step.labels,
+							callsign: step.callsign,
 						});
 					}}
 					onSubmit={handleLabelsSubmit}
-					isPending={isTriggerConfigPending}
-					labelsError={labelsError}
+					isPending={isPending}
+					showBackButton={!isReconfiguring}
 				/>
 			)}
 
diff --git a/internal-packages/workflow-designer-ui/src/editor/properties-panel/trigger-node-properties-panel/providers/github-trigger/utils/resolve-next-step.ts b/internal-packages/workflow-designer-ui/src/editor/properties-panel/trigger-node-properties-panel/providers/github-trigger/utils/resolve-next-step.ts
new file mode 100644
index 0000000000..b6d91d40a6
--- /dev/null
+++ b/internal-packages/workflow-designer-ui/src/editor/properties-panel/trigger-node-properties-panel/providers/github-trigger/utils/resolve-next-step.ts
@@ -0,0 +1,182 @@
+import type {
+	GitHubFlowTriggerEvent,
+	TriggerNode,
+} from "@giselle-sdk/data-type";
+import type { GitHubTriggerEventId } from "@giselle-sdk/flow";
+import {
+	createTriggerEvent,
+	isTriggerRequiringCallsign,
+	isTriggerRequiringLabels,
+} from "./trigger-configuration";
+
+interface SelectEvent {
+	state: "select-event";
+	eventId: GitHubTriggerEventId;
+}
+interface SelectRepositoryStep {
+	state: "select-repository";
+	eventId: GitHubTriggerEventId;
+	callsign?: string;
+	labels?: string[];
+	installationId?: number;
+}
+interface InputCallsignStep {
+	state: "input-callsign";
+	eventId: GitHubTriggerEventId;
+	owner: string;
+	repo: string;
+	repoNodeId: string;
+	installationId: number;
+	callsign?: string;
+}
+interface InputLabelsStep {
+	state: "input-labels";
+	eventId: GitHubTriggerEventId;
+	owner: string;
+	repo: string;
+	repoNodeId: string;
+	installationId: number;
+	labels?: string[];
+	callsign?: string;
+}
+interface ConfirmRepositoryStep {
+	state: "confirm-repository";
+	eventId: GitHubTriggerEventId;
+	installationId: number;
+	owner: string;
+	repo: string;
+	repoNodeId: string;
+	callsign?: string;
+	labels?: string[];
+}
+
+export type GitHubTriggerSetupStep =
+	| SelectEvent
+	| SelectRepositoryStep
+	| InputCallsignStep
+	| InputLabelsStep
+	| ConfirmRepositoryStep;
+
+export interface RepositoryInfo {
+	installationId: number;
+	repoNodeId: string;
+	owner: string;
+	repo: string;
+}
+
+type StepAction =
+	| {
+			type: "continue";
+			nextStep: GitHubTriggerSetupStep;
+	  }
+	| {
+			type: "submit";
+			event: GitHubFlowTriggerEvent;
+			repositoryInfo: RepositoryInfo;
+	  };
+
+interface StepSubmissionData {
+	callsign?: string;
+	labels?: string[];
+}
+
+interface resolveNextStepProps {
+	currentStep: GitHubTriggerSetupStep;
+	eventId: GitHubTriggerEventId;
+	submissionData: StepSubmissionData;
+	nodeStatus: TriggerNode["content"]["state"]["status"];
+}
+
+export function resolveNextStep({
+	currentStep,
+	eventId,
+	submissionData,
+	nodeStatus,
+}: resolveNextStepProps): StepAction {
+	switch (currentStep.state) {
+		case "confirm-repository": {
+			const repositoryInfo = {
+				installationId: currentStep.installationId,
+				owner: currentStep.owner,
+				repo: currentStep.repo,
+				repoNodeId: currentStep.repoNodeId,
+			} satisfies RepositoryInfo;
+			const persistedCallsign = currentStep.callsign;
+			const persistedLabels = currentStep.labels;
+
+			const inputCallsignStep = {
+				state: "input-callsign",
+				eventId,
+				...repositoryInfo,
+				callsign: persistedCallsign,
+			} satisfies InputCallsignStep;
+
+			const inputLabelsStep = {
+				state: "input-labels",
+				eventId,
+				...repositoryInfo,
+				labels: persistedLabels,
+			} satisfies InputLabelsStep;
+
+			if (
+				isTriggerRequiringCallsign(eventId) &&
+				nodeStatus === "unconfigured"
+			) {
+				return {
+					type: "continue",
+					nextStep: inputCallsignStep,
+				};
+			}
+			if (isTriggerRequiringLabels(eventId) && nodeStatus === "unconfigured") {
+				return {
+					type: "continue",
+					nextStep: inputLabelsStep,
+				};
+			}
+
+			return {
+				type: "submit",
+				event: createTriggerEvent({
+					eventId,
+					callsign: submissionData.callsign ?? persistedCallsign,
+					labels: submissionData.labels ?? persistedLabels,
+				}),
+				repositoryInfo,
+			};
+		}
+
+		case "input-callsign": {
+			return {
+				type: "submit",
+				event: createTriggerEvent({
+					eventId,
+					callsign: submissionData.callsign,
+				}),
+				repositoryInfo: {
+					installationId: currentStep.installationId,
+					repoNodeId: currentStep.repoNodeId,
+					owner: currentStep.owner,
+					repo: currentStep.repo,
+				} satisfies RepositoryInfo,
+			};
+		}
+
+		case "input-labels": {
+			return {
+				type: "submit",
+				event: createTriggerEvent({ eventId, labels: submissionData.labels }),
+				repositoryInfo: {
+					installationId: currentStep.installationId,
+					repoNodeId: currentStep.repoNodeId,
+					owner: currentStep.owner,
+					repo: currentStep.repo,
+				} satisfies RepositoryInfo,
+			};
+		}
+
+		default:
+			throw new Error(
+				`Cannot process submission for step: ${currentStep.state}`,
+			);
+	}
+}
diff --git a/internal-packages/workflow-designer-ui/src/editor/properties-panel/trigger-node-properties-panel/providers/github-trigger/utils/trigger-configuration.ts b/internal-packages/workflow-designer-ui/src/editor/properties-panel/trigger-node-properties-panel/providers/github-trigger/utils/trigger-configuration.ts
index 995865fda4..20123455c3 100644
--- a/internal-packages/workflow-designer-ui/src/editor/properties-panel/trigger-node-properties-panel/providers/github-trigger/utils/trigger-configuration.ts
+++ b/internal-packages/workflow-designer-ui/src/editor/properties-panel/trigger-node-properties-panel/providers/github-trigger/utils/trigger-configuration.ts
@@ -11,6 +11,111 @@ import {
 	githubTriggers,
 } from "@giselle-sdk/flow";
 
+/**
+ * GitHub trigger events that require a callsign condition
+ */
+const CALLSIGN_REQUIRED_EVENTS = [
+	"github.issue_comment.created",
+	"github.pull_request_comment.created",
+	"github.pull_request_review_comment.created",
+] as const;
+
+/**
+ * GitHub trigger events that require labels condition
+ */
+const LABELS_REQUIRED_EVENTS = [
+	"github.issue.labeled",
+	"github.pull_request.labeled",
+] as const;
+
+/**
+ * Union type of event IDs that require callsign
+ */
+type CallsignRequiredEventId = (typeof CALLSIGN_REQUIRED_EVENTS)[number];
+
+/**
+ * Union type of event IDs that require labels
+ */
+type LabelsRequiredEventId = (typeof LABELS_REQUIRED_EVENTS)[number];
+
+/**
+ * GitHubFlowTriggerEvent with callsign condition
+ */
+type CallsignRequiredEvent = Extract<
+	GitHubFlowTriggerEvent,
+	{ id: CallsignRequiredEventId }
+>;
+
+/**
+ * GitHubFlowTriggerEvent with labels condition
+ */
+type LabelsRequiredEvent = Extract<
+	GitHubFlowTriggerEvent,
+	{ id: LabelsRequiredEventId }
+>;
+
+/**
+ * Checks if an event ID exists in a given list
+ */
+function isEventInList(
+	eventId: GitHubTriggerEventId,
+	events: readonly GitHubTriggerEventId[],
+) {
+	return events.includes(eventId);
+}
+
+/**
+ * Type guard to check if an event has callsign condition
+ */
+export function hasCallsignCondition(
+	event: GitHubFlowTriggerEvent,
+): event is CallsignRequiredEvent {
+	return isEventInList(event.id, CALLSIGN_REQUIRED_EVENTS);
+}
+
+/**
+ * Type guard to check if an event has labels condition
+ */
+export function hasLabelsCondition(
+	event: GitHubFlowTriggerEvent,
+): event is LabelsRequiredEvent {
+	return isEventInList(event.id, LABELS_REQUIRED_EVENTS);
+}
+
+/**
+ * Checks if a trigger event ID requires callsign
+ */
+export function isTriggerRequiringCallsign(eventId: GitHubTriggerEventId) {
+	return isEventInList(eventId, CALLSIGN_REQUIRED_EVENTS);
+}
+
+/**
+ * Checks if a trigger event ID requires labels
+ */
+export function isTriggerRequiringLabels(eventId: GitHubTriggerEventId) {
+	return isEventInList(eventId, LABELS_REQUIRED_EVENTS);
+}
+
+/**
+ * Extracts callsign from an event if it has one
+ */
+export function extractCallsign(event: GitHubFlowTriggerEvent) {
+	if (!hasCallsignCondition(event)) {
+		return undefined;
+	}
+	return event.conditions.callsign;
+}
+
+/**
+ * Extracts labels from an event if it has them
+ */
+export function extractLabels(event: GitHubFlowTriggerEvent) {
+	if (!hasLabelsCondition(event)) {
+		return undefined;
+	}
+	return event.conditions.labels;
+}
+
 /**
  * Type definitions for trigger configuration options
  */
@@ -78,21 +183,12 @@ export function createTriggerEvent(args: {
 	}
 }
 
-/**
- * Determines if a trigger type requires a callsign
- */
-function isTriggerRequiringCallsign(eventId: GitHubTriggerEventId): boolean {
-	return [
-		"github.issue_comment.created",
-		"github.pull_request_comment.created",
-		"github.pull_request_review_comment.created",
-	].includes(eventId);
-}
-
 /**
  * Generates the outputs for a given trigger
  */
-function generateTriggerOutputs(eventId: GitHubTriggerEventId): Output[] {
+export function generateTriggerOutputs(
+	eventId: GitHubTriggerEventId,
+): Output[] {
 	const trigger = githubTriggers[eventId];
 	const outputs: Output[] = [];
 
@@ -101,7 +197,7 @@ function generateTriggerOutputs(eventId: GitHubTriggerEventId): Output[] {
 			id: OutputId.generate(),
 			label: getGitHubDisplayLabel({ eventId, accessor: key }),
 			accessor: key,
-		});
+		} satisfies Output);
 	}
 
 	return outputs;
diff --git a/internal-packages/workflow-designer-ui/src/editor/properties-panel/trigger-node-properties-panel/providers/github-trigger/utils/use-configure-trigger.ts b/internal-packages/workflow-designer-ui/src/editor/properties-panel/trigger-node-properties-panel/providers/github-trigger/utils/use-configure-trigger.ts
new file mode 100644
index 0000000000..0e3b5d02d4
--- /dev/null
+++ b/internal-packages/workflow-designer-ui/src/editor/properties-panel/trigger-node-properties-panel/providers/github-trigger/utils/use-configure-trigger.ts
@@ -0,0 +1,114 @@
+import type {
+	FlowTriggerId,
+	GitHubFlowTriggerEvent,
+	TriggerNode,
+} from "@giselle-sdk/data-type";
+import { githubTriggers } from "@giselle-sdk/flow";
+import {
+	useFeatureFlag,
+	useGiselleEngine,
+	useWorkflowDesigner,
+} from "@giselle-sdk/giselle/react";
+import { useCallback, useTransition } from "react";
+import type { RepositoryInfo } from "./resolve-next-step";
+import { generateTriggerOutputs } from "./trigger-configuration";
+
+interface UseConfigureTriggerReturn {
+	configureTrigger: ({
+		event,
+		repositoryInfo,
+		flowTriggerId,
+	}: {
+		event: GitHubFlowTriggerEvent;
+		repositoryInfo: RepositoryInfo;
+		flowTriggerId?: FlowTriggerId;
+	}) => void;
+	isPending: boolean;
+}
+
+/**
+ * Hook for executing GitHub trigger setup operations
+ * Handles both initial configuration and reconfiguration
+ */
+export const useConfigureTrigger = ({
+	node,
+}: {
+	node: TriggerNode;
+}): UseConfigureTriggerReturn => {
+	const { experimental_storage } = useFeatureFlag();
+	const { data: workspace, updateNodeData } = useWorkflowDesigner();
+	const client = useGiselleEngine();
+	const [isPending, startTransition] = useTransition();
+
+	const configureTrigger = useCallback(
+		({
+			event,
+			repositoryInfo,
+			flowTriggerId,
+		}: {
+			event: GitHubFlowTriggerEvent;
+			repositoryInfo: RepositoryInfo;
+			flowTriggerId?: FlowTriggerId;
+		}) => {
+			const trigger = githubTriggers[event.id];
+			startTransition(async () => {
+				try {
+					let triggerId: FlowTriggerId;
+
+					if (
+						flowTriggerId !== undefined &&
+						node.content.state.status === "reconfiguring"
+					) {
+						const result = await client.reconfigureGitHubTrigger({
+							flowTriggerId,
+							repositoryNodeId: repositoryInfo.repoNodeId,
+							installationId: repositoryInfo.installationId,
+							useExperimentalStorage: experimental_storage,
+							event,
+						});
+						triggerId = result.triggerId;
+					} else {
+						const result = await client.configureTrigger({
+							trigger: {
+								nodeId: node.id,
+								workspaceId: workspace.id,
+								enable: false,
+								configuration: {
+									provider: "github",
+									repositoryNodeId: repositoryInfo.repoNodeId,
+									installationId: repositoryInfo.installationId,
+									event,
+								},
+							},
+							useExperimentalStorage: experimental_storage,
+						});
+						triggerId = result.triggerId;
+					}
+
+					updateNodeData(node, {
+						content: {
+							...node.content,
+							state: {
+								status: "configured",
+								flowTriggerId: triggerId,
+							},
+						},
+						outputs:
+							node.outputs.length > 0
+								? node.outputs
+								: generateTriggerOutputs(event.id),
+						name:
+							node.content.state.status === "reconfiguring"
+								? node.name
+								: `On ${trigger.event.label}`,
+					});
+				} catch (_error) {
+					// Error is handled by the UI state
+				}
+			});
+		},
+		[workspace.id, client, node, updateNodeData, experimental_storage],
+	);
+
+	return { configureTrigger, isPending };
+};
diff --git a/internal-packages/workflow-designer-ui/src/editor/properties-panel/trigger-node-properties-panel/providers/github-trigger/utils/use-trigger-configuration.ts b/internal-packages/workflow-designer-ui/src/editor/properties-panel/trigger-node-properties-panel/providers/github-trigger/utils/use-trigger-configuration.ts
deleted file mode 100644
index 6f1eb1d0e5..0000000000
--- a/internal-packages/workflow-designer-ui/src/editor/properties-panel/trigger-node-properties-panel/providers/github-trigger/utils/use-trigger-configuration.ts
+++ /dev/null
@@ -1,93 +0,0 @@
-import {
-	type GitHubFlowTriggerEvent,
-	type Output,
-	OutputId,
-	type TriggerNode,
-} from "@giselle-sdk/data-type";
-import { getGitHubDisplayLabel, githubTriggers } from "@giselle-sdk/flow";
-import {
-	useFeatureFlag,
-	useGiselleEngine,
-	useWorkflowDesigner,
-} from "@giselle-sdk/giselle/react";
-import { useCallback, useTransition } from "react";
-import type {
-	InputCallsignStep,
-	InputLabelsStep,
-} from "../github-trigger-properties-panel";
-
-interface UseTriggerConfigurationReturn {
-	configureTrigger: (
-		event: GitHubFlowTriggerEvent,
-		step: InputCallsignStep | InputLabelsStep,
-	) => void;
-	isPending: boolean;
-}
-
-export const useTriggerConfiguration = ({
-	node,
-}: {
-	node: TriggerNode;
-}): UseTriggerConfigurationReturn => {
-	const { experimental_storage } = useFeatureFlag();
-	const { data: workspace, updateNodeData } = useWorkflowDesigner();
-	const client = useGiselleEngine();
-	const [isPending, startTransition] = useTransition();
-
-	const configureTrigger = useCallback(
-		(
-			event: GitHubFlowTriggerEvent,
-			step: InputCallsignStep | InputLabelsStep,
-		) => {
-			const trigger = githubTriggers[event.id];
-
-			const outputs: Output[] = [];
-			for (const key of trigger.event.payloads.keyof().options) {
-				outputs.push({
-					id: OutputId.generate(),
-					label: getGitHubDisplayLabel({
-						eventId: event.id,
-						accessor: key,
-					}),
-					accessor: key,
-				});
-			}
-
-			startTransition(async () => {
-				try {
-					const { triggerId } = await client.configureTrigger({
-						trigger: {
-							nodeId: node.id,
-							workspaceId: workspace.id,
-							enable: false,
-							configuration: {
-								provider: "github",
-								repositoryNodeId: step.repoNodeId,
-								installationId: step.installationId,
-								event,
-							},
-						},
-						useExperimentalStorage: experimental_storage,
-					});
-
-					updateNodeData(node, {
-						content: {
-							...node.content,
-							state: {
-								status: "configured",
-								flowTriggerId: triggerId,
-							},
-						},
-						outputs: [...node.outputs, ...outputs],
-						name: `On ${trigger.event.label}`,
-					});
-				} catch (_error) {
-					// Error is handled by the UI state
-				}
-			});
-		},
-		[workspace.id, client, node, updateNodeData, experimental_storage],
-	);
-
-	return { configureTrigger, isPending };
-};
diff --git a/internal-packages/workflow-designer-ui/src/editor/properties-panel/trigger-node-properties-panel/ui/configured-views/github-trigger-configured-view.tsx b/internal-packages/workflow-designer-ui/src/editor/properties-panel/trigger-node-properties-panel/ui/configured-views/github-trigger-configured-view.tsx
index 2094a6ba17..67cf5e1121 100644
--- a/internal-packages/workflow-designer-ui/src/editor/properties-panel/trigger-node-properties-panel/ui/configured-views/github-trigger-configured-view.tsx
+++ b/internal-packages/workflow-designer-ui/src/editor/properties-panel/trigger-node-properties-panel/ui/configured-views/github-trigger-configured-view.tsx
@@ -18,6 +18,10 @@ import {
 	PullRequestReadyForReviewIcon,
 	PullRequestReviewCommentCreatedIcon,
 } from "../../providers/github-trigger/components/icons";
+import {
+	hasCallsignCondition,
+	hasLabelsCondition,
+} from "../../providers/github-trigger/utils/trigger-configuration";
 import { GitHubRepositoryBlock } from "../";
 
 // Icon mapping for GitHub trigger events
@@ -57,12 +61,16 @@ const DefaultEventIcon = ({
 	</svg>
 );
 
+export type GitHubTriggerReconfigureMode = "repository" | "callsign" | "labels";
+
 export function GitHubTriggerConfiguredView({
 	flowTriggerId,
 	node,
+	onStartReconfigure,
 }: {
 	flowTriggerId: FlowTriggerId;
 	node: TriggerNode;
+	onStartReconfigure?: (mode: GitHubTriggerReconfigureMode) => void;
 }) {
 	const { updateNodeData } = useWorkflowDesigner();
 	const { isLoading, data, enableFlowTrigger, disableFlowTrigger } =
@@ -77,6 +85,19 @@ export function GitHubTriggerConfiguredView({
 		return "No Data";
 	}
 
+	const beginReconfigure = (mode: GitHubTriggerReconfigureMode) => {
+		onStartReconfigure?.(mode);
+		updateNodeData(node, {
+			content: {
+				...node.content,
+				state: {
+					status: "reconfiguring",
+					flowTriggerId,
+				},
+			},
+		});
+	};
+
 	const handleEnableFlowTrigger = async () => {
 		try {
 			setActionInProgress(true);
@@ -208,74 +229,81 @@ export function GitHubTriggerConfiguredView({
 						type="button"
 						className="bg-primary-900 hover:bg-primary-800 text-inverse font-medium px-4 py-2 rounded-md text-[14px] transition-colors"
 						onClick={() => {
-							updateNodeData(node, {
-								content: {
-									...node.content,
-									state: {
-										status: "reconfiguring",
-										flowTriggerId,
-									},
-								},
-							});
+							beginReconfigure("repository");
 						}}
 					>
 						Change Repository
 					</button>
 				</div>
 			</div>
-			{(data.trigger.configuration.event.id ===
-				"github.issue_comment.created" ||
-				data.trigger.configuration.event.id ===
-					"github.pull_request_comment.created" ||
-				data.trigger.configuration.event.id ===
-					"github.pull_request_review_comment.created") && (
-				<div>
-					<div className="space-y-[4px]">
-						<p className="text-[14px] py-[1.5px] text-[#F7F9FD]">Call sign</p>
-						<div className="px-[4px] py-[9px] w-full bg-transparent text-[14px] flex items-center gap-[8px]">
-							<span>
-								/{data.trigger.configuration.event.conditions.callsign}
-							</span>
-							<ClipboardButton
-								text={`/${data.trigger.configuration.event.conditions.callsign}`}
-								className="text-black-400 hover:text-black-300"
-								sizeClassName="h-[16px] w-[16px]"
-							/>
+			{hasCallsignCondition(data.trigger.configuration.event) && (
+				<div className="space-y-[4px]">
+					<p className="text-[14px] py-[1.5px] text-[#F7F9FD]">Call sign</p>
+					<div className="flex justify-between items-start">
+						<div className="flex-1 space-y-[4px]">
+							<div className="px-[4px] py-[9px] w-full bg-transparent text-[14px] flex items-center gap-[8px]">
+								<span>
+									/{data.trigger.configuration.event.conditions.callsign}
+								</span>
+								<ClipboardButton
+									text={`/${data.trigger.configuration.event.conditions.callsign}`}
+									className="text-black-400 hover:text-black-300"
+									sizeClassName="h-[16px] w-[16px]"
+								/>
+							</div>
+							<p className="text-[12px] text-inverse px-[4px]">
+								Use{" "}
+								<span className="text-blue-400 font-medium">
+									/{data.trigger.configuration.event.conditions.callsign}
+								</span>{" "}
+								in GitHub comments to trigger this workflow.
+							</p>
 						</div>
-						<p className="text-[12px] text-inverse px-[4px]">
-							Use{" "}
-							<span className="text-blue-400 font-medium">
-								/{data.trigger.configuration.event.conditions.callsign}
-							</span>{" "}
-							in GitHub comments to trigger this workflow.
-						</p>
+						<button
+							type="button"
+							className="bg-primary-900 hover:bg-primary-800 text-inverse font-medium px-4 py-2 rounded-md text-[14px] transition-colors"
+							onClick={() => {
+								beginReconfigure("callsign");
+							}}
+						>
+							Change Callsign
+						</button>
 					</div>
 				</div>
 			)}
-			{(data.trigger.configuration.event.id === "github.issue.labeled" ||
-				data.trigger.configuration.event.id ===
-					"github.pull_request.labeled") && (
-				<div>
-					<div className="space-y-[4px]">
-						<p className="text-[14px] py-[1.5px] text-[#F7F9FD]">Labels</p>
-						<div className="px-[4px] py-[9px] w-full bg-transparent text-[14px]">
-							<div className="flex flex-wrap gap-[4px]">
-								{data.trigger.configuration.event.conditions.labels.map(
-									(label) => (
-										<span
-											key={label}
-											className="bg-blue-500/20 text-blue-400 px-2 py-1 rounded-md text-[12px]"
-										>
-											{label}
-										</span>
-									),
-								)}
+			{hasLabelsCondition(data.trigger.configuration.event) && (
+				<div className="space-y-[4px]">
+					<p className="text-[14px] py-[1.5px] text-[#F7F9FD]">Labels</p>
+					<div className="flex justify-between items-start">
+						<div className="flex-1 space-y-[4px]">
+							<div className="px-[4px] py-[9px] w-full bg-transparent text-[14px]">
+								<div className="flex flex-wrap gap-[4px]">
+									{data.trigger.configuration.event.conditions.labels.map(
+										(label) => (
+											<span
+												key={label}
+												className="bg-blue-500/20 text-blue-400 px-2 py-1 rounded-md text-[12px]"
+											>
+												{label}
+											</span>
+										),
+									)}
+								</div>
 							</div>
+							<p className="text-[12px] text-inverse px-[4px]">
+								This workflow triggers when any of these labels are added to an
+								issue.
+							</p>
 						</div>
-						<p className="text-[12px] text-inverse px-[4px]">
-							This workflow triggers when any of these labels are added to an
-							issue.
-						</p>
+						<button
+							type="button"
+							className="bg-primary-900 hover:bg-primary-800 text-inverse font-medium px-4 py-2 rounded-md text-[14px] transition-colors"
+							onClick={() => {
+								beginReconfigure("labels");
+							}}
+						>
+							Change Labels
+						</button>
 					</div>
 				</div>
 			)}
diff --git a/internal-packages/workflow-designer-ui/src/editor/properties-panel/trigger-node-properties-panel/ui/reconfiguring-views/github-trigger-reconfiguring-view.tsx b/internal-packages/workflow-designer-ui/src/editor/properties-panel/trigger-node-properties-panel/ui/reconfiguring-views/github-trigger-reconfiguring-view.tsx
index a203ae39bd..d7f95fc111 100644
--- a/internal-packages/workflow-designer-ui/src/editor/properties-panel/trigger-node-properties-panel/ui/reconfiguring-views/github-trigger-reconfiguring-view.tsx
+++ b/internal-packages/workflow-designer-ui/src/editor/properties-panel/trigger-node-properties-panel/ui/reconfiguring-views/github-trigger-reconfiguring-view.tsx
@@ -2,17 +2,27 @@ import type { FlowTriggerId, TriggerNode } from "@giselle-sdk/data-type";
 import type { GitHubIntegrationInstallation } from "@giselle-sdk/giselle";
 import { useGitHubTrigger } from "../../../../lib/use-github-trigger";
 import { Installed } from "../../providers/github-trigger/github-trigger-properties-panel";
+import type { GitHubTriggerSetupStep } from "../../providers/github-trigger/utils/resolve-next-step";
+import {
+	extractCallsign,
+	extractLabels,
+	isTriggerRequiringCallsign,
+	isTriggerRequiringLabels,
+} from "../../providers/github-trigger/utils/trigger-configuration";
+import type { GitHubTriggerReconfigureMode } from "../configured-views/github-trigger-configured-view";
 
 export function GitHubTriggerReconfiguringView({
 	installations,
 	node,
 	installationUrl,
 	flowTriggerId,
+	reconfigureMode,
 }: {
 	installations: GitHubIntegrationInstallation[];
 	node: TriggerNode;
 	installationUrl: string;
 	flowTriggerId: FlowTriggerId;
+	reconfigureMode?: GitHubTriggerReconfigureMode;
 }) {
 	const { isLoading, data } = useGitHubTrigger(flowTriggerId);
 	if (isLoading) {
@@ -28,10 +38,49 @@ export function GitHubTriggerReconfiguringView({
 		return "Unexpected state";
 	}
 
-	const reconfigStep = {
-		state: "select-repository" as const,
-		eventId: data.trigger.configuration.event.id,
+	const event = data.trigger.configuration.event;
+	const repositoryInfo = {
+		installationId: data.trigger.configuration.installationId,
+		repoNodeId: data.trigger.configuration.repositoryNodeId,
+		owner: data.githubRepositoryFullname.owner,
+		repo: data.githubRepositoryFullname.repo,
 	};
+	const persistedCallsign = extractCallsign(event);
+	const persistedLabels = extractLabels(event);
+
+	const reconfigStep: GitHubTriggerSetupStep = (() => {
+		if (
+			reconfigureMode === "callsign" &&
+			isTriggerRequiringCallsign(event.id) &&
+			persistedCallsign
+		) {
+			return {
+				state: "input-callsign",
+				eventId: event.id,
+				...repositoryInfo,
+				callsign: persistedCallsign,
+			};
+		}
+		if (
+			reconfigureMode === "labels" &&
+			isTriggerRequiringLabels(event.id) &&
+			persistedLabels
+		) {
+			return {
+				state: "input-labels",
+				eventId: event.id,
+				...repositoryInfo,
+				labels: persistedLabels,
+			};
+		}
+		return {
+			state: "select-repository",
+			eventId: event.id,
+			callsign: persistedCallsign,
+			labels: persistedLabels,
+			installationId: repositoryInfo.installationId,
+		};
+	})();
 
 	return (
 		<Installed
diff --git a/internal-packages/workflow-designer-ui/src/editor/properties-panel/ui/select-repository.tsx b/internal-packages/workflow-designer-ui/src/editor/properties-panel/ui/select-repository.tsx
index bf15d9615e..e6a697119b 100644
--- a/internal-packages/workflow-designer-ui/src/editor/properties-panel/ui/select-repository.tsx
+++ b/internal-packages/workflow-designer-ui/src/editor/properties-panel/ui/select-repository.tsx
@@ -20,15 +20,17 @@ export function SelectRepository({
 	installations,
 	installationUrl,
 	onSelectRepository,
+	initialInstallationId,
 }: Pick<
 	GitHubIntegrationInstalledState,
 	"installations" | "installationUrl"
 > & {
 	onSelectRepository: (value: SelectRepository) => void;
+	initialInstallationId?: number;
 }) {
 	const [selectedInstallationId, setSelectedInstallationId] = useState<
 		number | null
-	>(null);
+	>(() => initialInstallationId ?? null);
 	const [isOrgDropdownOpen, setIsOrgDropdownOpen] = useState(false);
 	const dropdownRef = useRef<HTMLDivElement>(null);
 
diff --git a/packages/giselle/src/engine/index.ts b/packages/giselle/src/engine/index.ts
index b9a257b849..dcc1e70ba0 100644
--- a/packages/giselle/src/engine/index.ts
+++ b/packages/giselle/src/engine/index.ts
@@ -3,6 +3,7 @@ import type {
 	FileId,
 	FlowTrigger,
 	FlowTriggerId,
+	GitHubFlowTriggerEvent,
 	NodeId,
 	SecretId,
 	Workspace,
@@ -320,6 +321,7 @@ export function GiselleEngine(config: GiselleEngineConfig) {
 			repositoryNodeId: string;
 			installationId: number;
 			useExperimentalStorage: boolean;
+			event?: GitHubFlowTriggerEvent;
 		}) => {
 			return await reconfigureGitHubTrigger({ ...args, context });
 		},
diff --git a/packages/giselle/src/engine/triggers/reconfigure-github-trigger.ts b/packages/giselle/src/engine/triggers/reconfigure-github-trigger.ts
index d0097d3e3e..c590082d49 100644
--- a/packages/giselle/src/engine/triggers/reconfigure-github-trigger.ts
+++ b/packages/giselle/src/engine/triggers/reconfigure-github-trigger.ts
@@ -1,6 +1,7 @@
 import {
 	type FlowTrigger,
 	type FlowTriggerId,
+	type GitHubFlowTriggerEvent,
 	isTriggerNode,
 	type TriggerNode,
 } from "@giselle-sdk/data-type";
@@ -18,6 +19,7 @@ export async function reconfigureGitHubTrigger(args: {
 	repositoryNodeId: string;
 	installationId: number;
 	useExperimentalStorage: boolean;
+	event?: GitHubFlowTriggerEvent;
 }) {
 	const currentTrigger = await getFlowTrigger({
 		storage: args.context.storage,
@@ -59,7 +61,7 @@ export async function reconfigureGitHubTrigger(args: {
 			provider: "github",
 			repositoryNodeId: newRepositoryNodeId,
 			installationId: args.installationId,
-			event: currentTrigger.configuration.event,
+			event: args.event ?? currentTrigger.configuration.event,
 		},
 	} satisfies FlowTrigger;
 	await setFlowTrigger({
diff --git a/packages/giselle/src/http/router.ts b/packages/giselle/src/http/router.ts
index 1b12192edd..0b71a4523b 100644
--- a/packages/giselle/src/http/router.ts
+++ b/packages/giselle/src/http/router.ts
@@ -3,6 +3,7 @@ import {
 	FileId,
 	FlowTrigger,
 	FlowTriggerId,
+	GitHubFlowTriggerEvent,
 	NodeId,
 	SecretId,
 	Workspace,
@@ -301,6 +302,7 @@ export const createJsonRouters = {
 				repositoryNodeId: z.string(),
 				installationId: z.number(),
 				useExperimentalStorage: z.boolean(),
+				event: GitHubFlowTriggerEvent.optional(),
 			}),
 			handler: async ({ input }) => {
 				return JsonResponse.json({