diff --git a/pika-baseos/debian/changelog b/pika-baseos/debian/changelog
index 6e58294..ffd4494 100644
--- a/pika-baseos/debian/changelog
+++ b/pika-baseos/debian/changelog
@@ -1,3 +1,10 @@
+pika-baseos (2.2.0) kinetic; urgency=medium
+
+  * Add env var fixer
+
+ -- Ward Nakchbandi <hotrod.master@hotmail.com>  Thu, 12 Jan 2023 16:48:00 +0300
+
+
 pika-baseos (2.1.0) kinetic; urgency=medium
 
   * Update for pika-kde-desktop
diff --git a/pika-baseos/etc/init.d/addenv b/pika-baseos/etc/init.d/addenv
new file mode 100755
index 0000000..4408c09
--- /dev/null
+++ b/pika-baseos/etc/init.d/addenv
@@ -0,0 +1,5 @@
+#! /bin/bash
+
+sed -i '/#startenvd/,/#endenvd/d'  /etc/environment
+
+echo -e "#startenvd\n$(cat /etc/environment.d/*)\n#endenvd" >> /etc/environment
diff --git a/pika-baseos/etc/rc0.d/S01addenv b/pika-baseos/etc/rc0.d/S01addenv
new file mode 100755
index 0000000..4408c09
--- /dev/null
+++ b/pika-baseos/etc/rc0.d/S01addenv
@@ -0,0 +1,5 @@
+#! /bin/bash
+
+sed -i '/#startenvd/,/#endenvd/d'  /etc/environment
+
+echo -e "#startenvd\n$(cat /etc/environment.d/*)\n#endenvd" >> /etc/environment
diff --git a/pika-baseos/etc/rc1.d/S01addenv b/pika-baseos/etc/rc1.d/S01addenv
new file mode 100755
index 0000000..4408c09
--- /dev/null
+++ b/pika-baseos/etc/rc1.d/S01addenv
@@ -0,0 +1,5 @@
+#! /bin/bash
+
+sed -i '/#startenvd/,/#endenvd/d'  /etc/environment
+
+echo -e "#startenvd\n$(cat /etc/environment.d/*)\n#endenvd" >> /etc/environment
diff --git a/pika-baseos/etc/rc2.d/S01addenv b/pika-baseos/etc/rc2.d/S01addenv
new file mode 100755
index 0000000..4408c09
--- /dev/null
+++ b/pika-baseos/etc/rc2.d/S01addenv
@@ -0,0 +1,5 @@
+#! /bin/bash
+
+sed -i '/#startenvd/,/#endenvd/d'  /etc/environment
+
+echo -e "#startenvd\n$(cat /etc/environment.d/*)\n#endenvd" >> /etc/environment
diff --git a/pika-baseos/etc/rc3.d/S01addenv b/pika-baseos/etc/rc3.d/S01addenv
new file mode 100755
index 0000000..4408c09
--- /dev/null
+++ b/pika-baseos/etc/rc3.d/S01addenv
@@ -0,0 +1,5 @@
+#! /bin/bash
+
+sed -i '/#startenvd/,/#endenvd/d'  /etc/environment
+
+echo -e "#startenvd\n$(cat /etc/environment.d/*)\n#endenvd" >> /etc/environment
diff --git a/pika-baseos/etc/rc4.d/S01addenv b/pika-baseos/etc/rc4.d/S01addenv
new file mode 100755
index 0000000..4408c09
--- /dev/null
+++ b/pika-baseos/etc/rc4.d/S01addenv
@@ -0,0 +1,5 @@
+#! /bin/bash
+
+sed -i '/#startenvd/,/#endenvd/d'  /etc/environment
+
+echo -e "#startenvd\n$(cat /etc/environment.d/*)\n#endenvd" >> /etc/environment
diff --git a/pika-baseos/etc/rc5.d/S01addenv b/pika-baseos/etc/rc5.d/S01addenv
new file mode 100755
index 0000000..4408c09
--- /dev/null
+++ b/pika-baseos/etc/rc5.d/S01addenv
@@ -0,0 +1,5 @@
+#! /bin/bash
+
+sed -i '/#startenvd/,/#endenvd/d'  /etc/environment
+
+echo -e "#startenvd\n$(cat /etc/environment.d/*)\n#endenvd" >> /etc/environment
diff --git a/pika-baseos/etc/rc6.d/S01addenv b/pika-baseos/etc/rc6.d/S01addenv
new file mode 100755
index 0000000..4408c09
--- /dev/null
+++ b/pika-baseos/etc/rc6.d/S01addenv
@@ -0,0 +1,5 @@
+#! /bin/bash
+
+sed -i '/#startenvd/,/#endenvd/d'  /etc/environment
+
+echo -e "#startenvd\n$(cat /etc/environment.d/*)\n#endenvd" >> /etc/environment
diff --git a/pika-baseos/etc/rcS.d/S01addenv b/pika-baseos/etc/rcS.d/S01addenv
new file mode 100755
index 0000000..4408c09
--- /dev/null
+++ b/pika-baseos/etc/rcS.d/S01addenv
@@ -0,0 +1,5 @@
+#! /bin/bash
+
+sed -i '/#startenvd/,/#endenvd/d'  /etc/environment
+
+echo -e "#startenvd\n$(cat /etc/environment.d/*)\n#endenvd" >> /etc/environment