diff --git a/helm/service/horizon/Chart.yaml b/helm/service/horizon/Chart.yaml
new file mode 100644
index 000000000..4fc629c4e
--- /dev/null
+++ b/helm/service/horizon/Chart.yaml
@@ -0,0 +1,10 @@
+name: horizon
+version: 0.4.0-1
+description: Helm chart for horizon
+keywords:
+  - openstack
+  - horizon
+sources:
+  - http://github.com/openstack
+engine: gotpl
+#icon: A URL to an SVG or PNG image to be used as an icon (optional). make this point to the new project icons when ready
diff --git a/helm/service/horizon/requirements.yaml b/helm/service/horizon/requirements.yaml
new file mode 100644
index 000000000..fd4d8da1b
--- /dev/null
+++ b/helm/service/horizon/requirements.yaml
@@ -0,0 +1,7 @@
+dependencies:
+  - name: horizon-svc
+    repository: http://localhost:10191
+    version: 0.4.0-1
+  - name: horizon-deployment
+    repository: http://localhost:10191
+    version: 0.4.0-1
diff --git a/helm/service/horizon/values.yaml b/helm/service/horizon/values.yaml
new file mode 100644
index 000000000..00d02bb31
--- /dev/null
+++ b/helm/service/horizon/values.yaml
@@ -0,0 +1,12 @@
+global:
+    kolla:
+        all:
+            kubernetes_entrypoint: true
+        horizon:
+            deployment:
+                kubernetes_entrypoint: true
+                dependencies:
+                    service:
+                    - horizon
+                    - keystone-internal
+
diff --git a/releasenotes/notes/horizon-service-package-7801a17f287ba5f9.yaml b/releasenotes/notes/horizon-service-package-7801a17f287ba5f9.yaml
new file mode 100644
index 000000000..d43a72f9e
--- /dev/null
+++ b/releasenotes/notes/horizon-service-package-7801a17f287ba5f9.yaml
@@ -0,0 +1,4 @@
+---
+features:
+  - |
+    Horizon service level deployment with kubernetes entrypoint.
diff --git a/tests/bin/basic_tests.sh b/tests/bin/basic_tests.sh
index 49a48696c..612f39940 100755
--- a/tests/bin/basic_tests.sh
+++ b/tests/bin/basic_tests.sh
@@ -28,6 +28,17 @@ function wait_for_vm_ssh {
     set -ex
 }
 
+function wait_for_http {
+    count=0
+    while true; do
+        st=$(curl -Lsf "$1" > /dev/null )
+        [ $? -eq 0 ] && break
+        sleep 1
+        count=$((count+1))
+        [ $count -gt 30 ] && echo Failed to contact "$1". && exit -1
+    done
+}
+
 function scp_to_vm {
     sshpass -p 'cubswin:)' scp -o UserKnownHostsFile=/dev/null -o \
         StrictHostKeyChecking=no "$2" cirros@$1:"$3"
@@ -54,6 +65,9 @@ function wait_for_cinder {
     done
 }
 
+HORIZON_URL=http://$(kubectl get svc horizon --namespace=kolla -o \
+    jsonpath='{.spec.clusterIP}'):80/
+wait_for_http $HORIZON_URL
 curl -Lsf http://`kubectl get svc horizon --namespace=kolla -o \
     jsonpath='{.spec.clusterIP}'`:80/ | grep 'OpenStack Dashboard'
 
diff --git a/tests/bin/ceph_workflow_service.sh b/tests/bin/ceph_workflow_service.sh
index ce2b051ce..6f94d4b87 100755
--- a/tests/bin/ceph_workflow_service.sh
+++ b/tests/bin/ceph_workflow_service.sh
@@ -95,9 +95,6 @@ helm install kolla/nova-metadata-svc --version $VERSION \
 helm install kolla/nova-novncproxy-svc --version $VERSION \
     --namespace kolla --name nova-novncproxy-svc --set element_name=nova
 
-helm install kolla/horizon-svc --version $VERSION \
-    --namespace kolla --name horizon-svc --set element_name=horizon
-
 $DIR/tools/pull_containers.sh kolla
 $DIR/tools/wait_for_pods.sh kolla
 
@@ -266,10 +263,6 @@ for x in nova-conductor nova-scheduler nova-consoleauth; do
       --namespace kolla --name $x
 done
 
-helm install kolla/horizon-deployment --version $VERSION \
-    --set "$common_vars,element_name=horizon" \
-    --namespace kolla --name horizon-deployment
-
 $DIR/tools/pull_containers.sh kolla
 $DIR/tools/wait_for_pods.sh kolla
 
@@ -281,6 +274,11 @@ helm install kolla/nova-compute-daemonset --version $VERSION \
     --set "$common_vars,ceph_backend=true,tunnel_interface=$tunnel_interface,element_name=nova-compute" \
     --namespace kolla --name nova-compute-daemonset
 
+helm install kolla/horizon --version $VERSION \
+    --namespace kolla --name horizon \
+    --set "$common_vars,element_name=horizon" \
+    --values <(helm_entrypoint_general $1)
+
 #kollakube res create pod keepalived
 
 $DIR/tools/pull_containers.sh kolla