diff --git a/k8s/configmap.yaml b/k8s/configmap.yaml
new file mode 100644
index 0000000..e8f9e96
--- /dev/null
+++ b/k8s/configmap.yaml
@@ -0,0 +1,10 @@
+# k8s/moj-servis/configmap.yaml
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: moj-servis-config
+  namespace: student-jakov34
+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
index a9e9aa0..0ecc45d 100644
--- a/k8s/moj-servis/deployment.yaml
+++ b/k8s/moj-servis/deployment.yaml
@@ -3,7 +3,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: moj-servis
-  namespace: student-jakov34
+  namespace: student-VAŠ_KORISNIK
 spec:
   replicas: 1
   selector:
@@ -15,14 +15,29 @@ spec:
         app: moj-servis
     spec:
       containers:
-        - name: moj-servis
-          image: git.fpmoz.sum.ba/jakov34/moj-servis:1.0
-          ports:
-            - containerPort: 8000
-          resources:
-            requests:
-              memory: "64Mi"
-              cpu: "50m"
-            limits:
-              memory: "128Mi"
-              cpu: "200m"
+      - name: moj-servis
+        image: git.fpmoz.sum.ba/VAŠ_KORISNIK/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..bbf3fe9
--- /dev/null
+++ b/k8s/moj-servis/ingress.yaml
@@ -0,0 +1,20 @@
+# k8s/moj-servis/ingress.yaml
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: moj-servis-ingress
+  namespace: student-VAŠ_KORISNIK
+  annotations:
+    traefik.ingress.kubernetes.io/router.entrypoints: web
+spec:
+  rules:
+  - host: VAŠ_KORISNIK.argocd.fpmoz.sum.ba
+    http:
+      paths:
+      - path: /
+        pathType: Prefix
+        backend:
+          service:
+            name: moj-servis-svc
+            port:
+              number: 80