diff --git a/solution/day-1/step-3-bonus/bonus-3-hpa/hpa-deployment.yaml b/solution/day-1/step-3-bonus/bonus-3-hpa/hpa-deployment.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..801b83fc929be13a2debc555b5d2c939b23b07f7
--- /dev/null
+++ b/solution/day-1/step-3-bonus/bonus-3-hpa/hpa-deployment.yaml
@@ -0,0 +1,28 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: hpa
+  labels:
+    app: hpa
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: hpa
+  template:
+    metadata:
+      labels:
+        app: hpa
+    spec:
+      imagePullSecrets:
+      - name: atakima-school-registry
+      containers:
+      - name: hpa
+        image: registry.gitlab.com/takima-school/images/hpa:latest
+        ports:
+        - containerPort: 80
+        resources:
+          limits:
+            cpu: 500m
+          requests:
+            cpu: 200m
diff --git a/solution/day-1/step-3-bonus/bonus-3-hpa/hpa-service.yaml b/solution/day-1/step-3-bonus/bonus-3-hpa/hpa-service.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..15c72de847cd12c6d984fdbf089eb7f94fd3c6fd
--- /dev/null
+++ b/solution/day-1/step-3-bonus/bonus-3-hpa/hpa-service.yaml
@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: hpa
+  labels:
+    app: hpa
+spec:
+  ports:
+  - port: 80
+  selector:
+    app: hpa
diff --git a/solution/day-1/step-3-bonus/bonus-4-network-policy/networkPolicy-deployment.yaml b/solution/day-1/step-3-bonus/bonus-4-network-policy/networkPolicy-deployment.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..b0fd094a3ba9591bac0140037d983c44210f5cb9
--- /dev/null
+++ b/solution/day-1/step-3-bonus/bonus-4-network-policy/networkPolicy-deployment.yaml
@@ -0,0 +1,19 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    app: nginx
+  name: nginx
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: nginx
+  template:
+    metadata:
+      labels:
+        app: nginx
+    spec:
+      containers:
+      - image: registry.takima.io/school/proxy/nginx:1.7.9
+        name: nginx
diff --git a/solution/day-1/step-3-bonus/bonus-4-network-policy/networkPolicy-policy.yaml b/solution/day-1/step-3-bonus/bonus-4-network-policy/networkPolicy-policy.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..89ee9886925e7b9f31fc475b319833379e712276
--- /dev/null
+++ b/solution/day-1/step-3-bonus/bonus-4-network-policy/networkPolicy-policy.yaml
@@ -0,0 +1,13 @@
+apiVersion: networking.k8s.io/v1
+kind: NetworkPolicy
+metadata:
+  name: access-nginx
+spec:
+  podSelector:
+    matchLabels:
+      app: nginx
+  ingress:
+  - from:
+    - podSelector:
+        matchLabels:
+          access: "true"
diff --git a/solution/day-1/step-3-bonus/bonus-5-affinity/deployment.yaml b/solution/day-1/step-3-bonus/bonus-5-affinity/deployment.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..5b0dbf6d165f69a798a26d240cecf4e4d7ef926c
--- /dev/null
+++ b/solution/day-1/step-3-bonus/bonus-5-affinity/deployment.yaml
@@ -0,0 +1,27 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    app: nginx
+  name: nginx
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: nginx
+  template:
+    metadata:
+      labels:
+        app: nginx
+    spec:
+      nodeAffinity:
+        requiredDuringSchedulingIgnoredDuringExecution:
+          nodeSelectorTerms:
+          - matchExpressions:
+            - key: topology.kubernetes.io/zone
+              operator: In
+              values:
+              - eu-west-3a
+      containers:
+      - image: registry.takima.io/school/proxy/nginx:1.7.9
+        name: nginx
diff --git a/solution/day-1/step-3-bonus/bonus-6-daemonset/daemonset.yaml b/solution/day-1/step-3-bonus/bonus-6-daemonset/daemonset.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..ac6660918a6f0313d4a73e9ba3231774d2bdbc87
--- /dev/null
+++ b/solution/day-1/step-3-bonus/bonus-6-daemonset/daemonset.yaml
@@ -0,0 +1,18 @@
+apiVersion: apps/v1
+kind: DaemonSet
+metadata:
+  name: nginx
+  labels:
+    app: nginx
+spec:
+  selector:
+    matchLabels:
+      app: nginx
+  template:
+    metadata:
+      labels:
+        app: nginx
+    spec:
+      containers:
+        - name: nginx
+          image: registry.takima.io/school/proxy/nginx:1.7.9
\ No newline at end of file
diff --git a/solution/day-1/step-3-bonus/bonus-7-deployment-strategy/deployment.yaml b/solution/day-1/step-3-bonus/bonus-7-deployment-strategy/deployment.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..7962622632abe3040ca7b7d1dce1a3b032497140
--- /dev/null
+++ b/solution/day-1/step-3-bonus/bonus-7-deployment-strategy/deployment.yaml
@@ -0,0 +1,21 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    app: nginx
+  name: nginx
+spec:
+  strategy:
+    type: Recreate
+  replicas: 1
+  selector:
+    matchLabels:
+      app: nginx
+  template:
+    metadata:
+      labels:
+        app: nginx
+    spec:
+      containers:
+      - image: registry.takima.io/school/proxy/nginx:1.7.9
+        name: nginx