diff --git a/pkg/server/response.go b/pkg/server/response.go
index 0522d0b..b59b34e 100644
--- a/pkg/server/response.go
+++ b/pkg/server/response.go
@@ -3,6 +3,6 @@ package server
 type Response struct {
 	Environment []string          `json:"environment"`
 	Runtime     map[string]string `json:"runtime"`
-	Labels      []string          `json:"labels"`
-	Annotations []string          `json:"annotations"`
+	Labels      map[string]string `json:"labels"`
+	Annotations map[string]string `json:"annotations"`
 }
diff --git a/pkg/server/server.go b/pkg/server/server.go
index 39d051e..96447fb 100644
--- a/pkg/server/server.go
+++ b/pkg/server/server.go
@@ -8,6 +8,8 @@ import (
 	"runtime"
 	"strconv"
 
+	"strings"
+
 	"github.com/pkg/errors"
 	"gopkg.in/yaml.v2"
 )
@@ -40,13 +42,13 @@ func (s *Server) index(w http.ResponseWriter, r *http.Request) {
 	}
 	runtime["hostname"], _ = os.Hostname()
 
-	labels, err := readFiles("/etc/podinfod/metadata/labels")
+	labels, err := filesToMap("/etc/podinfod/metadata/labels")
 	if err != nil {
 		w.WriteHeader(http.StatusInternalServerError)
 		w.Write([]byte(err.Error()))
 	}
 
-	annotations, err := readFiles("/etc/podinfod/metadata/annotations")
+	annotations, err := filesToMap("/etc/podinfod/metadata/annotations")
 	if err != nil {
 		w.WriteHeader(http.StatusInternalServerError)
 		w.Write([]byte(err.Error()))
@@ -80,8 +82,8 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	s.mux.ServeHTTP(w, r)
 }
 
-func readFiles(dir string) ([]string, error) {
-	files := []string{}
+func filesToMap(dir string) (map[string]string, error) {
+	files := make([]string, 0)
 	err := filepath.Walk(dir, func(path string, f os.FileInfo, err error) error {
 		files = append(files, path)
 
@@ -90,24 +92,18 @@ func readFiles(dir string) ([]string, error) {
 	if err != nil {
 		return nil, errors.Wrapf(err, "Reading from %v failed", dir)
 	}
-	list := make([]string, 0)
+	list := make(map[string]string, 0)
 	for _, path := range files {
 		data, err := ioutil.ReadFile(path)
 		if err != nil {
 			return nil, errors.Wrapf(err, "Reading %v failed", path)
 		}
-		content := string(data)
-		duplicate := false
-		for _, p := range list {
-			if p == content {
-				duplicate = true
-				break
-			}
+		kv := strings.Split(string(data), "=")
+		if len(kv) > 1 {
+			list[kv[0]] = kv[1]
+		} else {
+			list[kv[0]] = ""
 		}
-		if duplicate {
-			continue
-		}
-		list = append(list, content)
 	}
 	return list, nil
 }