diff --git a/helm-toolkit/.gitignore b/helm-toolkit/.gitignore
deleted file mode 100644
index f5f3a91ab..000000000
--- a/helm-toolkit/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-secrets/*
-!secrets/.gitkeep
-templates/_secrets.tpl
diff --git a/helm-toolkit/.helmignore b/helm-toolkit/.helmignore
deleted file mode 100644
index e8ef5ffab..000000000
--- a/helm-toolkit/.helmignore
+++ /dev/null
@@ -1,27 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-
-bin/
-etc/
-patches/
-*.py
-Makefile
diff --git a/helm-toolkit/Chart.yaml b/helm-toolkit/Chart.yaml
index 4e81afaa5..f24c1e2a0 100644
--- a/helm-toolkit/Chart.yaml
+++ b/helm-toolkit/Chart.yaml
@@ -16,3 +16,10 @@ apiVersion: v1
 description: OpenStack-Helm Helm-Toolkit
 name: helm-toolkit
 version: 0.1.0
+home: https://docs.openstack.org/openstack-helm
+icon: https://www.openstack.org/themes/openstack/images/project-mascots/OpenStack-Helm/OpenStack_Project_OpenStackHelm_vertical.png
+sources:
+  - https://git.openstack.org/cgit/openstack/openstack-helm-infra
+  - https://git.openstack.org/cgit/openstack/openstack-helm
+maintainers:
+  - name: OpenStack-Helm Authors
diff --git a/helm-toolkit/Makefile b/helm-toolkit/Makefile
deleted file mode 100644
index 9662e57a8..000000000
--- a/helm-toolkit/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 2017 The Openstack-Helm Authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-EXCLUDE := templates/* charts/* Chart.yaml requirement* values.yaml Makefile utils/* helm-toolkit/Chart.yaml
-SECRETS := $(shell find secrets -type f $(foreach e,$(EXCLUDE), -not -path "$(e)") )
-
-templates/_secrets.tpl: Makefile $(SECRETS)
-	echo Generating $(CURDIR)/$@
-	rm -f $@
-	for i in $(SECRETS); do  printf '{{ define "'$$i'" }}' >> $@; cat $$i >> $@; printf "{{ end }}\n" >> $@; done
diff --git a/helm-toolkit/values.yaml b/helm-toolkit/values.yaml
index 9a2b0c22d..37c002ab9 100644
--- a/helm-toolkit/values.yaml
+++ b/helm-toolkit/values.yaml
@@ -16,11 +16,3 @@
 # This is a YAML-formatted file.
 # Declare name/value pairs to be passed into your templates.
 # name: value
-
-global:
-  region: cluster
-  tld: local
-
-endpoints:
-  fqdn: null
-