diff --git a/HelmChart/Public/oneuptime/templates/_helpers.tpl b/HelmChart/Public/oneuptime/templates/_helpers.tpl
index 08db5c5323..16d6ad1938 100644
--- a/HelmChart/Public/oneuptime/templates/_helpers.tpl
+++ b/HelmChart/Public/oneuptime/templates/_helpers.tpl
@@ -509,7 +509,7 @@ Usage:
   value: {{ $.Values.script.workflowScriptTimeoutInMs | squote }}
 
 - name: WORKFLOW_TIMEOUT_IN_MS
-  value: {{ $.Values.workflow.workflowTimeoutInMs | squote }}
+  value: {{ $.Values.worker.workflowTimeoutInMs | squote }}
 
 - name: AVERAGE_SPAN_ROW_SIZE_IN_BYTES
   value: {{ $.Values.billing.telemetry.averageSpanRowSizeInBytes | quote }}
diff --git a/HelmChart/Public/oneuptime/templates/workflow.yaml b/HelmChart/Public/oneuptime/templates/workflow.yaml
deleted file mode 100644
index e7ed200cc6..0000000000
--- a/HelmChart/Public/oneuptime/templates/workflow.yaml
+++ /dev/null
@@ -1,134 +0,0 @@
-{{- if $.Values.workflow.enabled }}
-# OneUptime workflow Deployment
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ printf "%s-%s" $.Release.Name "workflow"  }}
-  namespace: {{ $.Release.Namespace }}
-  labels:
-    app: {{ printf "%s-%s" $.Release.Name "workflow"  }}
-    app.kubernetes.io/part-of: oneuptime
-    app.kubernetes.io/managed-by: Helm
-    appname: oneuptime
-    {{- if $.Values.deployment.includeTimestampLabel }}
-    date: "{{ now | unixEpoch }}"
-    {{- end }}
-spec:
-  selector:
-    matchLabels:
-      app: {{ printf "%s-%s" $.Release.Name "workflow"  }}
-  {{- if $.Values.workflow.replicaCount }}
-  replicas: {{ $.Values.workflow.replicaCount }}
-  {{- else }}
-  {{- if or (not $.Values.autoscaling.enabled) ($.Values.workflow.disableAutoscaler) }}
-  replicas: {{ $.Values.deployment.replicaCount }}
-  {{- end }}
-  {{- end }}
-  strategy: {{- toYaml $.Values.deployment.updateStrategy | nindent 4 }}
-  template:
-    metadata:
-      labels:
-        app: {{ printf "%s-%s" $.Release.Name "workflow"  }}
-        {{- if $.Values.deployment.includeTimestampLabel }}
-        date: "{{ now | unixEpoch }}"
-        {{- end }}
-        appname: oneuptime
-    spec:
-      {{- if $.Values.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml $.Values.imagePullSecrets | nindent 8 }}
-      {{- end }}
-      {{- if $.Values.workflow.podSecurityContext }}
-      securityContext:
-        {{- toYaml $.Values.workflow.podSecurityContext | nindent 8 }}
-      {{- else if $.Values.podSecurityContext }}
-      securityContext:
-        {{- toYaml $.Values.podSecurityContext | nindent 8 }}
-      {{- end }}
-      {{- if $.Values.affinity }}
-      affinity: {{- $.Values.affinity | toYaml | nindent 8 }}
-      {{- end }}
-      {{- if $.Values.tolerations }}
-      tolerations: {{- $.Values.tolerations | toYaml | nindent 8 }}
-      {{- end }}
-      {{- if $.Values.workflow.nodeSelector }}
-      nodeSelector:
-        {{- toYaml $.Values.workflow.nodeSelector | nindent 8 }}
-      {{- else if $.Values.nodeSelector }}
-      nodeSelector:
-        {{- toYaml $.Values.nodeSelector | nindent 8 }}
-      {{- end }}
-      containers:
-        - image: {{ include "oneuptime.image" (dict "Values" $.Values "ServiceName" "workflow") }}
-          name: {{ printf "%s-%s" $.Release.Name "workflow"  }}
-          {{- if $.Values.startupProbe.enabled }}
-          # Startup probe
-          startupProbe:
-            httpGet:
-              path: /status/live
-              port: {{ $.Values.workflow.ports.http }}
-            periodSeconds: {{ $.Values.startupProbe.periodSeconds }}
-            failureThreshold: {{ $.Values.startupProbe.failureThreshold }}
-          {{- end }}
-          {{- if $.Values.livenessProbe.enabled }}
-          # Liveness probe
-          livenessProbe:
-            httpGet:
-              path: /status/live
-              port: {{ $.Values.workflow.ports.http }}
-            periodSeconds: {{ $.Values.livenessProbe.periodSeconds }}
-            timeoutSeconds: {{ $.Values.livenessProbe.timeoutSeconds }}
-            initialDelaySeconds: {{ $.Values.livenessProbe.initialDelaySeconds }}
-          {{- end }}
-          {{- if $.Values.readinessProbe.enabled }}
-          # Readyness Probe
-          readinessProbe:
-            httpGet:
-              path: /status/ready
-              port: {{ $.Values.workflow.ports.http }}
-            periodSeconds: {{ $.Values.readinessProbe.periodSeconds }}
-            initialDelaySeconds: {{ $.Values.readinessProbe.initialDelaySeconds }}
-            timeoutSeconds: {{ $.Values.readinessProbe.timeoutSeconds }}
-          {{- end }}
-          {{- if $.Values.workflow.containerSecurityContext }}
-          securityContext:
-            {{- toYaml $.Values.workflow.containerSecurityContext | nindent 12 }}
-          {{- else if $.Values.containerSecurityContext }}
-          securityContext:
-            {{- toYaml $.Values.containerSecurityContext | nindent 12 }}
-          {{- end }}
-          imagePullPolicy: {{ $.Values.image.pullPolicy }}
-          env:
-            {{- include "oneuptime.env.common" . | nindent 12 }}
-            {{- include "oneuptime.env.runtime" (dict "Values" $.Values "Release" $.Release) | nindent 12 }}
-            - name: PORT
-              value: {{ $.Values.workflow.ports.http | quote }}
-            - name: DISABLE_TELEMETRY
-              value: {{ $.Values.workflow.disableTelemetryCollection | quote }}
-          ports:
-            - containerPort: {{ $.Values.workflow.ports.http }}
-              protocol: TCP
-              name: http
-          {{- if $.Values.workflow.resources }}
-          resources:
-            {{- toYaml $.Values.workflow.resources | nindent 12 }}
-          {{- end }}
-
-      restartPolicy: {{ $.Values.image.restartPolicy }}
-
----
-
-# OneUptime workflow autoscaler
-{{- if not $.Values.workflow.disableAutoscaler }}
-{{- $workflowAutoScalerArgs := dict "ServiceName" "workflow" "Release" $.Release "Values" $.Values -}}
-{{- include "oneuptime.autoscaler" $workflowAutoScalerArgs }}
-{{- end }}
----
-
-{{- end }}
-
-# OneUptime workflow Service
-{{- $workflowPorts := $.Values.workflow.ports -}}
-{{- $workflowServiceArgs := dict "ServiceName" "workflow" "Ports" $workflowPorts "Release" $.Release "Values" $.Values -}}
-{{- include "oneuptime.service" $workflowServiceArgs }}
----
diff --git a/HelmChart/Public/oneuptime/values.schema.json b/HelmChart/Public/oneuptime/values.schema.json
index f558520aa2..4ed256a49e 100644
--- a/HelmChart/Public/oneuptime/values.schema.json
+++ b/HelmChart/Public/oneuptime/values.schema.json
@@ -1526,6 +1526,9 @@
         "concurrency": {
           "type": "integer"
         },
+        "workflowTimeoutInMs": {
+          "type": "integer"
+        },
         "ports": {
           "type": "object",
           "properties": {
@@ -1574,48 +1577,6 @@
       },
       "additionalProperties": false
     },
-    "workflow": {
-      "type": "object",
-      "properties": {
-        "enabled": {
-          "type": "boolean"
-        },
-        "replicaCount": {
-          "type": "integer"
-        },
-        "disableTelemetryCollection": {
-          "type": "boolean"
-        },
-        "disableAutoscaler": {
-          "type": "boolean"
-        },
-        "workflowTimeoutInMs": {
-          "type": "integer"
-        },
-        "ports": {
-          "type": "object",
-          "properties": {
-            "http": {
-              "type": "integer"
-            }
-          },
-          "additionalProperties": false
-        },
-        "resources": {
-          "type": ["object", "null"]
-        },
-        "nodeSelector": {
-          "type": "object"
-        },
-        "podSecurityContext": {
-          "type": "object"
-        },
-        "containerSecurityContext": {
-          "type": "object"
-        }
-      },
-      "additionalProperties": false
-    },
     "docs": {
       "type": "object",
       "properties": {
diff --git a/HelmChart/Public/oneuptime/values.yaml b/HelmChart/Public/oneuptime/values.yaml
index 1d65986e12..308ca93e52 100644
--- a/HelmChart/Public/oneuptime/values.yaml
+++ b/HelmChart/Public/oneuptime/values.yaml
@@ -640,6 +640,7 @@ worker:
   disableTelemetryCollection: false
   disableAutoscaler: false
   concurrency: 100
+  workflowTimeoutInMs: 5000
   ports:
     http: 1445
   resources:
@@ -658,19 +659,6 @@ worker:
     # Cooldown period after scaling (in seconds)
     cooldownPeriod: 300
 
-workflow:
-  enabled: true
-  replicaCount: 1
-  disableTelemetryCollection: false
-  disableAutoscaler: false
-  workflowTimeoutInMs: 5000
-  ports:
-    http: 3099
-  resources:
-  nodeSelector: {}
-  podSecurityContext: {}
-  containerSecurityContext: {}
-
 app:
   enabled: true
   replicaCount: 1