diff --git a/helm-charts/flink-historyserver/templates/historyserver.yaml b/helm-charts/flink-historyserver/templates/historyserver.yaml
index 11a710e..8db1f06 100644
--- a/helm-charts/flink-historyserver/templates/historyserver.yaml
+++ b/helm-charts/flink-historyserver/templates/historyserver.yaml
@@ -1,69 +1,153 @@
 apiVersion: flink.apache.org/v1beta1
 kind: FlinkDeployment
 metadata:
-  finalizers:
-  - flinkdeployments.flink.apache.org/finalizer
-  generation: 2
   name: historyserver
   namespace: default
 spec:
   flinkConfiguration:
-    taskmanager.memory.flink.size: 1024m 
+    taskmanager.memory.flink.size: 1024m
     taskmanager.numberOfTaskSlots: "1"
   flinkVersion: v1_16
   image: flink:1.16
+  serviceAccount: flink
   jobManager:
-    podTemplate:
-      apiVersion: v1
-      kind: Pod
-      spec:
-        containers:
-        - image: flink:1.16
-          name: flink-main-container
-          volumeMounts:
-          - mountPath: /opt/history/jobs
-            name: efs-flink-history
-        initContainers:
-        - command:
-          - sh
-          - -c
-          - chown 9999:9999 /opt/history/jobs && ls -lhd /opt/history/jobs
-          image: busybox:1.36.1
-          name: efs-mount-ownership-fix
-          volumeMounts:
-          - mountPath: /opt/history/jobs
-            name: efs-flink-history
-        securityContext:
-          fsGroup: 9999
-        volumes:
-        - name: efs-flink-history
-          persistentVolumeClaim:
-            claimName: flink-historyserver-efs-pvc
     replicas: 1
-    resource:
-      cpu: 0.3
-      memory: 1536m 
-  serviceAccount: flink
-  taskManager:
-    podTemplate:
-      apiVersion: v1
-      kind: Pod
-      spec:
-        containers:
-        - args:
-          - --worker_pool
-          command:
-          - /opt/apache/beam/boot
-          image: apache/beam_python3.9_sdk:2.50.0
-          name: beam-worker-pool
-          ports:
-          - containerPort: 50000
-          readinessProbe:
-            periodSeconds: 10
-            tcpSocket:
-              port: 50000
-          resources: {}
-    replicas: 5
     resource:
       cpu: 0.3
       memory: 1536m
+  taskManager: {}
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  generation: 1
+  labels:
+    app: historyserver-full
+  name: historyserver-full
+  namespace: default
+spec:
+  progressDeadlineSeconds: 600
+  replicas: 1
+  revisionHistoryLimit: 10
+  selector:
+    matchLabels:
+      app: historyserver-full
+  strategy:
+    rollingUpdate:
+      maxSurge: 25%
+      maxUnavailable: 25%
+    type: RollingUpdate
+  template:
+    metadata:
+      creationTimestamp: null
+      labels:
+        app: historyserver-full
+    spec:
+      containers:
+      - args:
+        - history-server
+        command:
+        - /docker-entrypoint.sh
+        env:
+        - name: _POD_IP_ADDRESS
+          valueFrom:
+            fieldRef:
+              apiVersion: v1
+              fieldPath: status.podIP
+        image: flink:1.16
+        imagePullPolicy: IfNotPresent
+        name: flink-main-container
+        ports:
+        - containerPort: 8081
+          name: rest
+          protocol: TCP
+        - containerPort: 8082
+          name: history
+          protocol: TCP
+        - containerPort: 6123
+          name: jobmanager-rpc
+          protocol: TCP
+        - containerPort: 6124
+          name: blobserver
+          protocol: TCP
+        resources:
+          limits:
+            cpu: 300m
+            memory: 1536Mi
+          requests:
+            cpu: 300m
+            memory: 1536Mi
+        startupProbe:
+          failureThreshold: 2147483647
+          httpGet:
+            path: /config
+            port: rest
+            scheme: HTTP
+          periodSeconds: 1
+          successThreshold: 1
+          timeoutSeconds: 1
+        terminationMessagePath: /dev/termination-log
+        terminationMessagePolicy: File
+        volumeMounts:
+        - mountPath: /opt/history/jobs
+          name: efs-flink-history
+        - mountPath: /opt/flink/conf
+          name: flink-config-volume
+      dnsPolicy: ClusterFirst
+      initContainers:
+      - command:
+        - sh
+        - -c
+        - chown 9999:9999 /opt/history/jobs && ls -lhd /opt/history/jobs
+        image: busybox:1.36.1
+        imagePullPolicy: IfNotPresent
+        name: efs-mount-ownership-fix
+        resources: {}
+        terminationMessagePath: /dev/termination-log
+        terminationMessagePolicy: File
+        volumeMounts:
+        - mountPath: /opt/history/jobs
+          name: efs-flink-history
+      restartPolicy: Always
+      schedulerName: default-scheduler
+      securityContext:
+        fsGroup: 9999
+      serviceAccount: flink
+      serviceAccountName: flink
+      terminationGracePeriodSeconds: 30
+      volumes:
+      - name: efs-flink-history
+        persistentVolumeClaim:
+          claimName: flink-historyserver-efs-pvc
+      - configMap:
+          defaultMode: 420
+          items:
+          - key: log4j-console.properties
+            path: log4j-console.properties
+          - key: flink-conf.yaml
+            path: flink-conf.yaml
+          name: flink-config-historyserver
+        name: flink-config-volume
+---
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app: historyserver-full
+  name: historyserver-rest-full
+  namespace: default
+spec:
+  ipFamilies:
+  - IPv4
+  ipFamilyPolicy: SingleStack
+  ports:
+  - name: history
+    port: 8082
+    protocol: TCP
+    targetPort: 8082
+  selector:
+    app: historyserver-full
+  sessionAffinity: None
+  type: ClusterIP
+status:
+  loadBalancer: {}