diff --git a/deployment.yaml b/deployment.yaml
deleted file mode 100644
index 763a4ff..0000000
--- a/deployment.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: moj-servis
-  namespace: student-leonarda11
-spec:
-  apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: moj-servis
-  namespace: student-leonarda11
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: moj-servis
-  template:
-    metadata:
-      labels:
-        app: moj-servis
-    spec:
-      containers:
-        - name: moj-servis
-          image: git.fpmoz.sum.ba/leonarda11/moj-servis:1.0
-          ports:
-            - containerPort: 8000
-          resources:
-            requests:
-              memory: "64Mi"
-              cpu: "50m"
-            limits:
-              memory: "128Mi"
-              cpu: "200m"
-      limits:
-        memory: "128Mi"
-        cpu: "200m"            
\ No newline at end of file
diff --git a/k8s/moj-servis/configmap.yaml b/k8s/moj-servis/configmap.yaml
new file mode 100644
index 0000000..5a76ade
--- /dev/null
+++ b/k8s/moj-servis/configmap.yaml
@@ -0,0 +1,9 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: moj-servis-config
+  namespace: student-leonarda11
+data:
+  SERVICE_NAME: "moj-servis"
+  LOG_LEVEL: "info"
+  WELCOME_MSG: "Pozdrav iz FPMOZ k3s clustera!"
diff --git a/k8s/moj-servis/deployment.yaml b/k8s/moj-servis/deployment.yaml
new file mode 100644
index 0000000..a1b869e
--- /dev/null
+++ b/k8s/moj-servis/deployment.yaml
@@ -0,0 +1,41 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: moj-servis
+  namespace: student-leonarda11
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: moj-servis
+  template:
+    metadata:
+      labels:
+        app: moj-servis
+    spec:
+      containers:
+      - name: moj-servis
+        image: git.fpmoz.sum.ba/leonarda11/moj-servis:1.0
+        ports:
+        - containerPort: 8000
+        envFrom:                          # <-- NOVO
+        - configMapRef:
+            name: moj-servis-config       # <-- ConfigMap
+        env:                               # <-- NOVO
+        - name: DB_PASSWORD
+          valueFrom:
+            secretKeyRef:
+              name: moj-servis-secret      # <-- Secret
+              key: DB_PASSWORD
+        - name: API_KEY
+          valueFrom:
+            secretKeyRef:
+              name: moj-servis-secret
+              key: API_KEY
+        resources:
+          requests:
+            memory: "64Mi"
+            cpu: "50m"
+          limits:
+            memory: "128Mi"
+            cpu: "200m"
diff --git a/k8s/moj-servis/ingress.yaml b/k8s/moj-servis/ingress.yaml
new file mode 100644
index 0000000..9c4b367
--- /dev/null
+++ b/k8s/moj-servis/ingress.yaml
@@ -0,0 +1,19 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: moj-servis-ingress
+  namespace: student-leonarda11
+  annotations:
+    traefik.ingress.kubernetes.io/router.entrypoints: web
+spec:
+  rules:
+  - host: leonarda11.argocd.fpmoz.sum.ba
+    http:
+      paths:
+      - path: /
+        pathType: Prefix
+        backend:
+          service:
+            name: moj-servis-svc
+            port:
+              number: 80