diff --git a/example/helm_vars/projectX/production/us-east-1/java-app/secrets.yaml b/example/helm_vars/projectX/production/us-east-1/java-app/secrets.yaml
index 9d57d58..04513e9 100644
--- a/example/helm_vars/projectX/production/us-east-1/java-app/secrets.yaml
+++ b/example/helm_vars/projectX/production/us-east-1/java-app/secrets.yaml
@@ -1,30 +1,31 @@
-secret_production_projectx: ENC[AES256_GCM,data:kQWVuSxOKzn2go4nbX0=,iv:OyaCipiCbwoggYRLdM5Z3dEHXEJKSRFohG/l9ATt6oM=,tag:1n9IPZRY+hmLqAJz4/uEZQ==,type:str]
+secret_production_projectx: ENC[AES256_GCM,data:h39e3ikBav2PNKjBMXw=,iv:EU42t6AX8RNdS2QUyE1+QcsSQuSFoOSzKuMunvUJsP4=,tag:/dRrsLyZfSwXRGh1MN2rvA==,type:str]
 sops:
     kms: []
     gcp_kms: []
-    lastmodified: '2017-11-02T21:33:35Z'
-    mac: ENC[AES256_GCM,data:2WNkuIK/ImtGRvnYIRIs6tYofxa2m91e89gXCVxXFsE0clOLO2lY/7ujOwiGBNiAt6k5zhU78/yn/TA6IQmGDg9wnQ8aZMDjWV9NatFfqAyHRSWC7KM8JG+LJD3U1GItPcnTHKxAbltzvxWfMmYOIbRa0D58rRwZdHxVmGnHqgY=,iv:f+7CmAFp28IGRLwX/kihVxPWEN9yyCIhMPqPLEYg90U=,tag:0gXp5bVHK4iqUcsbZWEe7A==,type:str]
+    azure_kv: []
+    lastmodified: '2018-10-23T19:50:37Z'
+    mac: ENC[AES256_GCM,data:/qQ3fuWzhX3d6fh4IpfEJjMcrKHuzqU9a34gFvyoUiK9SjyKBWLatl3a/DHLiaA9LL8oU33KnSfdm5PGoL/llemMRu3VPR0wLfq/Zp6W2DRBkPNMS/+UIDP4YA2NMsx1UscmCsSgKrFZ2I2C1NBwg//LJd+lL2dgZ7AJGKSYHEE=,iv:DeroeWinqSIHrDR88ekn2pPKNODt2mM139ToAiVyZdA=,tag:SteaPpkmB+09M7XT0Bwh5g==,type:str]
     pgp:
-    -   created_at: '2017-11-02T21:33:35Z'
+    -   created_at: '2018-10-23T19:50:36Z'
         enc: |-
             -----BEGIN PGP MESSAGE-----
 
-            wcFMAxYpv4YXKfBAARAAohqBHDTFnqSSkgAUpGm9A8Ij0T0HYi8H08SRkn56edtf
-            itSbZNHh+O14yxv4864vvN1X73OMdLJNd+EnNKkpXJ3dPR0L4t4YfiHi79V9fIzR
-            BEPWbcIa07nj07LfnVRYhwOHJ3Qn85KTtVAu+pU2oTwIGP3lzZDxVk6IiZZFR64K
-            zrY0AFRvHPh0iIPk4XZC/V2MD/fAoRZ7Fvk2+MiagdEbkd1bta9kbheclhMqutav
-            +ZxQy5Gh3C7r2SQTGGh/GdAYtRUePqAatk8B8aRJI1vrd8OOLKAT473XeXgwtOQv
-            SonNEcRFegdK3VuNPtlLLjTBp0UbotKtXOZirn2pha/ONVNMBn3mGr0Fymxv6nx3
-            XsdvDspWOqS12frGz8o8YGaxKbFY2LVuOOJ5uJwqZygJKXnAQTjsHo51qSqMt3tS
-            28y37aSliB39H5CL8Pgj4UopIvUA4i5Wk9S3lbUmoS1QUsQi/jHHydFeAZWSszqB
-            NI7N9vnpJTinNdlVML1hSGOsAHOQNAw3lsKpaUm/akQYHpnKl8/y1IuNAiL7T/Yj
-            QU75u67miVk4dHR5yqKdbElnf1sFU9MNQD5L0gFH6Xtk8od96LuWk++tH16WGld/
-            x73expRhYIm/Lt/2c90mzcBgb6vTth4g/J3GQaEjwLrwuH0fS/6r+CEpO4uy4sLS
-            4AHkR9Oezoy5CJO6UuSPZc+JpOHdduAQ4N7hf3jgsuLa6jlx4PDlHxpPDZRQx92d
-            AybY5/z8no/HDhTe5Y1DjiXON5o9fyTgiOQi/i+a0toYhGSg2ofizMFX4kkF4Crh
-            /Y4A
-            =O215
+            wcFMAxYpv4YXKfBAARAAo//JKgzOXoBNp7hdIqkkr8VOgxwR6pn3YYvSm9zf2tzk
+            BczA6986VRsLqpf2eYINcGJ8/ZCIuzLOT3iFAByuZxP5i0F+9n/WAFRt/nsW+Goq
+            f3WhIdraBeJFa37eAVDADDY5Ks1hDPJgsUdl+guXMmBX6YJG/YtofZCDVSGQOTcB
+            SqYuyxj3rnE+0D64P1K41LBQGJRi+LzaQ5JzFRCmH6RFcGXClzwZCO3PC0xKmNDE
+            fULgyIPdLDq4XiLnYSGJgqJ2Zz7ByxJddKyPSIULn8iREUVDxJpA1G2BF7JESpLz
+            t9bkjuwV/b6M7k0UKSjW5leDF8lkUjj/avfm6ZpjCc8Jdoq2klLs1XcKxyile7h5
+            416W9ITIsiXfsBXYrgLDJh6SdQBIyW/JIzLL+rtLRNmqU3p+3ugsHrd6Oi1soZnn
+            F+ZIiBggXN/Lh7yPVErBOnBNNpN56s1ch8x/rDZYbMUfX9gdfPIxWqnMzBxhiVYZ
+            G1rtSH3+yVs5bXdvtc7hlGgzumt18lhk1WEHsVxIVOXUpAoFrgewVtt++1d4LxGA
+            lmlmhYMb4ubTjsiZdSwq35Tamo0vXjvRhIPRvn1cm2cOt8AU3M6WV4GbZ/a9GS4Z
+            7X/gnHBMIQbYO2in6u427J4V22JrqZQ/0s39fTgwT06NJ2Vu39FSkPXjsvTrq2PS
+            4AHkDRQozeNXNeuiFXEza4Nz9+HcH+DM4KHhNDLgYuJGSI2I4I/lLxZDZHMOunpT
+            Ke2Ss7QJSZZoZ4L+OE5tUQYDXMgYXEvgUeTNXfO/EH+w64HiV7bGxowp4rHwLerh
+            kTcA
+            =pv4b
             -----END PGP MESSAGE-----
         fp: 4434EA5D05F10F59D0DF7399AF1D073646ED4927
     unencrypted_suffix: _unencrypted
-    version: 3.0.0
+    version: 3.1.1
diff --git a/example/helm_vars/projectX/sandbox/us-east-1/java-app/secrets.yaml b/example/helm_vars/projectX/sandbox/us-east-1/java-app/secrets.yaml
index b4a73c1..c48cab5 100644
--- a/example/helm_vars/projectX/sandbox/us-east-1/java-app/secrets.yaml
+++ b/example/helm_vars/projectX/sandbox/us-east-1/java-app/secrets.yaml
@@ -1,30 +1,31 @@
-secret_sandbox_projectx: ENC[AES256_GCM,data:hTjfR7kVV3NHHeu65aNxJQ==,iv:XdZfVbnaa2d/GrA9aYywaToCkYJC2NgS2sNmziRGwQ8=,tag:C17Dsk/Z2/CGpQZWtvo6Sw==,type:str]
+secret_sandbox_projectx: ENC[AES256_GCM,data:OEHGo4z0wF+oEGoH7sPfXQ==,iv:5eD6AiJNH7gOxtTGL6vMJDcy2zHCm7z5P7lrJU1+G00=,tag:6PkEnZ20C+z211uC30V/hA==,type:str]
 sops:
     kms: []
     gcp_kms: []
-    lastmodified: '2017-11-02T21:33:37Z'
-    mac: ENC[AES256_GCM,data:cJv+67hiCLTNFETc1aDpAzVfgHe9NwnFiWER83UETYMTvRVU55Nmjo4Ra5PGt7MseFVoOg0tYt5lOBRjP87xHG+a0yGacUt07fm37FQ2LeghnNpTIL0PlbRLeNwsijY1NCWhdcQyEMe78Q6a1+vYvEn1nNwroFO6JxQWmrqQCuY=,iv:buTjo5ibHY3lvSkr4FRj9u9Dg8HT/0felMRBXKD13jw=,tag:/SM3vSMvqRCnXdWebj9t7A==,type:str]
+    azure_kv: []
+    lastmodified: '2018-10-23T19:50:26Z'
+    mac: ENC[AES256_GCM,data:HAmu0eV0CFuRGQhiAjVyO2LgQUxOu0/1hwPP8AOB0FyrivvwlnhuZXEpMvMMI4AhOwRrw8qwVKZbKlhKq9ZB16Kilgp57yGtxg7kfNQeTi2WypWxKXX7yi3ZhIuIXrWfFH9v4+0IniHAwgGD30khxiM1D/dKM7D35b2ADaMvIQg=,iv:A/bqivCIpp8U7ZoTf1s1b54XLVkTDQfk+veSHyFUfm8=,tag:X0b40UiFXFg7vV7MKascCg==,type:str]
     pgp:
-    -   created_at: '2017-11-02T21:33:37Z'
+    -   created_at: '2018-10-23T19:50:26Z'
         enc: |-
             -----BEGIN PGP MESSAGE-----
 
-            wcFMAxYpv4YXKfBAARAAoVExGgdPxqYQYo8p2OCIoGwNIQEgRgge7juMI7O5LYfB
-            BEYx7lQ/7SyRY7xvfxMBgYZGoVuVCLqyYhn2t+YqTYgD5rRmdPe4Z4UrlI8Er0BW
-            hYKvWQtIWWlmBxqprjf9BDMKlETSLkpX2QtIeLUF/fgH0bHvBz7iBADrGee+JyWV
-            CY0MsE/TOnCoCIRxwRkneYCMRVPDmX7v73m/rSC32zTRYO8cwlD8eJrrsAn4H1xZ
-            9iYamvcfk9XxvasaxugXnX9qfQjUhRHLWknztgAZ7GiSZtVKjyUYyZQXF2Z0KU2o
-            KsAAmZHk4uwduXTlUWkbNhiglAXbTpjfhnPM/m3cSkORP0WPUDofnWOOyYUn97T+
-            GrjBtA2ePt8QSFcDIvhsNVKHvO2GpbHBRip2jdiIflH6gyXCAAj92hu2YSKRIbjS
-            joH+VUj0Wgs6ubtH05XfytC79hxVYSNYeGFOC9rJzmsTKidMBk+yGWLlSDJIcmjS
-            Azn26yoIkKtlnBAKJGZgauuiDkSv/K2PaURPdPaSLfE2LbzwC8AdmbR4UnP453NZ
-            xQRPU/O362JMQyG1flr1bmH9zBTm5ka+whYxG+DF8uE7onF4eVYQQ+R94jNMpX2J
-            lZMRql8t52r0VnAuMhqcgyH1s4tehi0M9sWsKpnpMclw2lK/mRIlJSQ0w1l/lKrS
-            4AHkACtuZUivERJQsDMd38FCmeED6OB34DPhO/PgIuILVKU84B3lT9Cr23cJsBL3
-            HR3F3m1ifIPfBh6Gz2AKIqjSe0f8JS7grOSIVEmKbFACg516hXTa2m9z4kpcmNjh
-            aXoA
-            =u8QR
+            wcFMAxYpv4YXKfBAARAAjP4LzWA1z7/+kkk2EoiCTW56npsnZzZbur87NjzShIBr
+            kO0E8w0ZXJFioIM0EighUmnFVerz4XB7q5VTQ4X7SVD2PXE1WCAFUZoWpJPLQ6bI
+            bZ052WyO5gFigIoQGlTZsCfoIstnkxmalrP5gIOJXtFfBFjIDuMOjjX/YWcJZy8i
+            qSROW04Mru7rhhxX5ZDubMCvjIF+r3KxaoKlSegnOCKq+XXQF9nMLyku+UUo0ZaD
+            DTODQwCL2zS/R8YgZrL1ZwNu7MQkGkuQJ5naOra3BC43OeOLS3SRhrO40LX56zDH
+            F0eLuE1nrlU0A6fAztAAUuNDcRF7Z3jDDGjQhUQ81D9JHyoKK6DtkiEfCrKhUoZt
+            Tzx8LDPdt4oNAlyllXRAnqz3BwrDE8f5V9aKPUXURb/Swhqzbn0l3gE1cVvkMO73
+            SBXiBhEKt3D6kQIhBujnANjLH2x1LuGq35A63YC7I2zuCteaAFnmzpYq/mMZZR3r
+            yCa7sWtHTOgOW0mKgCQG7EABUUFFelqeDim1yXra9Y2n12KfeaIUDfRXzmV5Eb6P
+            NYeC4OdfYx43tkKLnc72kp5RPDfgsZRBlUI5qZlFh1TaVoXB5U6xjwu2KmfJjaOj
+            4Hn+WIycLHxm6lnxVlzSurPio77KMhoa55p3+N4mV2fbevg5P2IQc0TBpKIrVhPS
+            4AHk7k0Wa0yxkCXL60F/O0Q+y+GnH+Bi4EvhlX/gTOKsxOpX4MDlEMX8zVJvc+94
+            hiKEBrVjBzlpiM8OPqRsDmIy15rKj9HgiOQjmkCbaepz3Iubw/JhutpT4v65WK3h
+            We0A
+            =ZjLI
             -----END PGP MESSAGE-----
         fp: 4434EA5D05F10F59D0DF7399AF1D073646ED4927
     unencrypted_suffix: _unencrypted
-    version: 3.0.0
+    version: 3.1.1
diff --git a/example/helm_vars/projectY/production/us-east-1/java-app/secrets.yaml b/example/helm_vars/projectY/production/us-east-1/java-app/secrets.yaml
index 8fbf9fe..6eaad33 100644
--- a/example/helm_vars/projectY/production/us-east-1/java-app/secrets.yaml
+++ b/example/helm_vars/projectY/production/us-east-1/java-app/secrets.yaml
@@ -1,30 +1,31 @@
-secret_production_projecty: ENC[AES256_GCM,data:2lnu3dLUuAyYDOxlTuw=,iv:LFoz74oMPOLKgbcUUleCyKTPo1GErXsUrVxYwR0OceI=,tag:L4iKy1OD8aBomAJ/7LFnUA==,type:str]
+secret_production_projecty: ENC[AES256_GCM,data:tGtjz5yKfWBxhuqqjl8=,iv:dGLZQzmwKptm868/SIf0RXHw2ZglIwFRJS+3Um49FHw=,tag:EooFt72/YpITvPmWpU5G9g==,type:str]
 sops:
     kms: []
     gcp_kms: []
-    lastmodified: '2017-11-02T21:33:38Z'
-    mac: ENC[AES256_GCM,data:bNfSjTSiQr11Kyky1/xwS2sdgTj/uOixzZDVR9R9y7Drb7ZLTQVWmU1EiE+EvLdIxv7NqtTbF3onGWKD3/EfD7P8K0km30Nio02OwpHfq+mUJxcNzoXebz5xGSvpgnkpgA5aJ9Akt74WNyBolRPkBQG8bhbDjb/GbCxZRKV/fBY=,iv:qXvAs1hhGEv/3+UH43ok2cDx7AOLrBlP4TS4EeFh48E=,tag:p7a1dA5hmNKlZyMN5THcug==,type:str]
+    azure_kv: []
+    lastmodified: '2018-10-23T19:50:59Z'
+    mac: ENC[AES256_GCM,data:PYD4KzOLNoFQ64RdT5PiqXYp4hXDgtfkFEJmfkMzgRfP5z+E4nYQAxWmY4vEwDVgDUqNr7RcLJ4I/FIUSonkN2GHc1F4LTp9Hfoo8Pa+l5ejql7vp3vItqTJ3ITk/rJiBAKwhixfGxBtpuiMYvJm1uOLHSBwNzNL61v4Nn/JE30=,iv:Uotp9ttUC4Ps5O8riGOl7FQA5kFYpUtbc4P+iscQvsg=,tag:tE7kAJgpwLj4ovZEfoSeoQ==,type:str]
     pgp:
-    -   created_at: '2017-11-02T21:33:38Z'
+    -   created_at: '2018-10-23T19:50:58Z'
         enc: |-
             -----BEGIN PGP MESSAGE-----
 
-            wcFMAxzSiC7ZHNQZARAAK0lw7gN34aYCgvcXcxBeP7D1wm4jK7vOpzxuSOTxVNyT
-            mVoajWSaYwXIJUdfYEuMxojVkX/4lgpNd+4Twm5r/5md8u0Zn1CeBh849tXiQirl
-            OJrsXpMHK6spgGMoPQymdROuSPTpoi3PlHZyBUMfIqzEVTEiYV0xLhpDAfBjGG5Q
-            fTusPMHSSesGV5VVcfdKYDVp3tRxiD0CTBe1fox2SIuDx9hUOwaUsJnc9Y+ogKZB
-            QqriP7vCFOYTlQxINHAvKQleesKgDSYi2FTqEPkOmq3V/9IRcI5UKXB6oY1yZF3j
-            81pkLVYk5yL/Q006hfWKNUliW2WYZO+yJF82W8Ui64WKv2sNVmgHRKgtW2EezWlw
-            lQLrcopO8d6usFadOOhrRuYYsqmG/+yvuoN/HUaTj9NEBwAy6PYngNVwQX8sBSgx
-            jYnwd/4NCUfpailp7RQOLXyo5KaxMAorC5VP/BYoRLO/90Yfo839oShfFzW9i7LC
-            CNpFKvqo3374Si7oaELS9a/BwHpvyolsBjqWjbHXsC1sHPieV6/WRUGdTPED8gis
-            Fht3DdRf94H4eaKOf6FQxAboWH68f+OQH8HLwawkkDukvyOQC12YAHYry2vt7jgD
-            mvl/yYWfOKLwIpOhMWfROj1xEh0AD+jYdOrZniEgUgtLIozNhyRoZGhjcUg8rnvS
-            4AHk27p+CooJDPs+jpJnWekFEuHsOeDu4OThMnLgeOIzC7pX4Gvl8Ky1R8hTAU9o
-            txylcfl7u1i2v0TbAqEa0Jr8BcSY4/vgeOT473Ui9ls0BVBVgmMaOiZE4k501ubh
-            q8MA
-            =j5nd
+            wcFMAxzSiC7ZHNQZARAASvue6fXwQgWUoU4Qj4Qu2AUTATTpUg5cMrjAzPFptKku
+            fyQnvmRcEP6qLp5Mun3KiIT/YAetAIsqJ8FhaTiLDdX3RAqrsQ0Lyr6qveAhqN17
+            HGmtQPK1UyunGNygw4Cs5UiAcekktQx25q7qvQ48kiKMc/asGa9blQYv7K3AAE7X
+            fNyCnIN7f+ZOk9IvmbHb7bCz4/XXfYks2j5tKJf/Vtgoukp+K59AP2Hcd3788gPT
+            LCm904jVbSiJJ1xmBo86Rue/osauBSDdi0GKMM64pYqUGqRWyWANXX6qM4U1JSaW
+            kq76Ab5fhUWdqpPOgISFbbKEVuEj8IIjzCtHSs56hCTIKDwyTZuwYbPypV7MY+Bu
+            mM1UYFCF1oMuRqVRxWIEKbABG/njvByyCQ7U9D3wG0L0AqMLYQpXx1EENQ13QT5h
+            KozVoidnGnbCvOM0Aqq7hkHOxQuNeaDyLiScObvf26i5xlIp2XNcm1iY0Hoxx3ps
+            0BLs2mrhfg9hMV5tE5/QHz2DQVJv0hDFvuC+3Hz46iybxqQeblxX8vdXPJlsC1wG
+            5W4zZRs7YU+G6rGu/0L0XT1wA4XB/TSgOd+N0Mc4CAnMyW5uqiPkS7JKU6lNcQYy
+            0BiKjtC9Vdo5KQkHcS8sgci8aW3mfjWYHaWtFM8VXJOkOoRUrI8Jrmzd+DqVTTnS
+            4AHk/U7SU+euZnqF0b0RS0acOOHeVOCI4OXhDNLgsuKJ/hTl4APlTXTSwQbRWD3T
+            XriloZGKYymCq1eXh4z2d5ikvIUvjvDgROQ1IAyuMfKevb/5LWaBRYJm4kmTn7Lh
+            GuoA
+            =i7bp
             -----END PGP MESSAGE-----
         fp: 40B6FAEC80FD467E3FE9421019F6A67BB1B8DDBE
     unencrypted_suffix: _unencrypted
-    version: 3.0.0
+    version: 3.1.1
diff --git a/example/helm_vars/projectY/sandbox/us-east-1/java-app/secrets.yaml b/example/helm_vars/projectY/sandbox/us-east-1/java-app/secrets.yaml
index 9c9c770..26c9e71 100644
--- a/example/helm_vars/projectY/sandbox/us-east-1/java-app/secrets.yaml
+++ b/example/helm_vars/projectY/sandbox/us-east-1/java-app/secrets.yaml
@@ -1,30 +1,31 @@
-secret_sandbox_projecty: ENC[AES256_GCM,data:XIHdxCrQY2qphvbcjs9Y,iv:zD/8QS4wEdk43bzBdbnc5ZDTFKwpbSOrFBn6h94INko=,tag:k2in9ny/gpQWU4nOXQ6HzA==,type:str]
+secret_sandbox_projecty: ENC[AES256_GCM,data:DQiceXJvxOnIYupIMGVb,iv:DnzOHPFgHPp/Uaj4mQMTs3INxfnntNWfMUV/5pgmRLE=,tag:sSNyH7Pc1wD9iMj6641glg==,type:str]
 sops:
     kms: []
     gcp_kms: []
-    lastmodified: '2017-11-02T21:33:40Z'
-    mac: ENC[AES256_GCM,data:GXbFlfpc8Es9GN2G590HoRC+AnBD328GXMpsfr4Oewa5EP1Lwo+3kulkxu0NHvNtJtGxnTeutKD0M0V0PrZodzgz9NkFyZDvXICHDiiRiKRUP5WCjBrUxYXKRBgTb9skzjiYXw55xW6o/640hzhGvLI0MGvyAs9C9yFn8nQxi6U=,iv:JJatGw24tVWSGSXZrQ1ADwDAaPfplXpMfriP9FsqXPY=,tag:Lify44u4O5uG8CvTldvBCw==,type:str]
+    azure_kv: []
+    lastmodified: '2018-10-23T19:50:47Z'
+    mac: ENC[AES256_GCM,data:/ZEzpJq6ky+CxtXkqKkRnrLPODsQh4QBlejxPImmwGguI+cEIJZihNecyyqFFOvnmM1nBAqpGna2vl3FhzVGcUOhkjPN8dxFAAK2+y1vs6hW87MXEWYp8p2BQjUV2nfWm8iCt7VN3c9Bx2yLaecOg9chYL0sM92k8GLNwODlGCI=,iv:Ls/dzjtbnflkDSCSt83OmJU1odVxJRKGaAvPvfPcgmE=,tag:1Ooi8+FhjU8Bhyl422WzvQ==,type:str]
     pgp:
-    -   created_at: '2017-11-02T21:33:40Z'
+    -   created_at: '2018-10-23T19:50:47Z'
         enc: |-
             -----BEGIN PGP MESSAGE-----
 
-            wcFMAxzSiC7ZHNQZARAAOg1D4TtuxVGoRkKUVA+i/Xqir3zkDXYxedbMQnXqRQYg
-            2uvaKXJe1srRQY8uNw2T92ne1uaw52RqxTvAvnuuyglJSG+iCLEjNMnF17lnNX7D
-            hV7MQ9KeFpP+TmrnkLXhqgOKxUZDy2AXDvXhLzwVFJ13W/GmGiIc/Kg1Aty85rYX
-            GhB+Dbr3y7Bra0IycuLtNAW0JOvIfHj+U0Ss3ZJKe0aBFmh/bLY+A8xxLgCD7+fy
-            yVzt8G/DeIzGoWfQvq2fK6/koWSW47Q5Q52XbEPCpQnkP5a7ytwfd66wbc+Lpjr1
-            8cAM6xsQJE6LnnMxswM1EPXQ+hSnT95QQigVbRtpK2T/EnY+tLpqq4hn/yt5yVQp
-            fOjpoh+CMGQhoI0hbcwOnqCIJ99XoAC0/ygbovTBdrHI2MVLju7S9sry7O5XFVVG
-            v5nie5iZbyZK+TF3RN3z9rXXEaWwcI/kcrd9YDFlDfNbX14sWuRUSUzZRCZ6LJTH
-            01kmtsmarfPHR2GdWqirTER1za7oSXNsPPPIjcMDDhwdj/AaYWMP/R88w9Vmj9wG
-            FQoOnC0YBvmBrwEqqe2X+/w2savawzGFeXf81MmQHE1YzMipgIqG7QPUBhIAQEx/
-            DRJxRSKZLGKMYGzr1lbFRn9b91xDKAO5jMHW1Oif6KfAOwzhaY8Sg44r7Amghi3S
-            4AHk6GqiC3bIyPFbV7jk/U8vG+EMheAC4Orh4M7gcOJ+CXB34PLlEWZ8dmrkKRE8
-            HvMbYezgrAw4uLKTVeF8uc3iSQYKwEHghOT9lX+kWjAaBTEVOCVorBGc4u1HxS/h
-            Gx0A
-            =Miem
+            wcFMAxzSiC7ZHNQZARAAKI6hbL7Amqr5yQWzo1sOQ4NuPdES+5RzQpR1FTARBd8r
+            B7hWQbFUh5D42B6KiqCM2Vfk/0UYj825jdr2XLVDsMJWYehoMh1Ibbn3Ulb0M56y
+            twJFCLR/4LaN3oWt05ZBnX4C2gQthnDPkBBDcsomEBUYZSW7wjjEHYGpAwjVys6m
+            GjO541Q1/Vz+IVT93YbRiUx2T3OEPnmsz82wPTttZPjG4F7fbjUEqjwJtfswsBHq
+            Q6vflzcikqPJYDoaOc/lnSoalwfSmfn8TECRiU9rivm7HVDIR67OWnQJd9HAwB0W
+            EVWfgzSDD4+n8VGHFTBuQRZJUciZ9BOQ4S4kZyo4immukcmuDqWvTmCky3XplIy9
+            GyMacnm85hEFyQVWvwbmenauvbH9QgxXKr7q1YIzM57fqnRA1wGLsZstOJy1S5Px
+            WoL8mpede0vno0SBdbbJQ3WjNiCnspa10s77I3u5+jCIdV7IySSQIiPhHsSP6iQi
+            xo1Hxl9ugRU3VgDBR1Cq9yCTTohS2ZG6Yk9SzgtIVI+Ab/OKRosecCpwCQ8pJ33l
+            zmGEYZs0EtJJi+DBq2Hy6wSM2NtkmFWiOVQxC3bYDn88yzsMnBXoDro4XRLNZwL0
+            Bu5PFCyird7VPXfqPTl6pnZZbWKMGJCNaimG3TxW5ST4I0L/RePkrmpzofL7PDLS
+            4AHkGBQPd+Sf0rnkr0pHk0GbZeF3bOA24EXhIzXgoeLsmw9+4HTl/SLkoxE6M2ne
+            WXB4pzsrIAGRY1LmoyqbgDShjYYElDbgnORJPhQRa06D7bfcyt8aw97n4juO5Cnh
+            iz8A
+            =E1Ri
             -----END PGP MESSAGE-----
         fp: 40B6FAEC80FD467E3FE9421019F6A67BB1B8DDBE
     unencrypted_suffix: _unencrypted
-    version: 3.0.0
+    version: 3.1.1
diff --git a/example/helm_vars/secrets.yaml b/example/helm_vars/secrets.yaml
index eb85cb6..7887c90 100644
--- a/example/helm_vars/secrets.yaml
+++ b/example/helm_vars/secrets.yaml
@@ -1,51 +1,52 @@
-global_secret: ENC[AES256_GCM,data:SNnd020i6xPnww==,iv:HEoQccGX9TKsBARE0UOPq3bEENQeail/NREzTY5We9s=,tag:BJi2NuKCOmsgy6Di+SMfgg==,type:str]
+global_secret: ENC[AES256_GCM,data:UxUcuPvk8Ehjzg==,iv:jQClpt2t1OxFfrw6uloFIbZAbc/Pg4+zqxMQvZkDPls=,tag:zPwvY64XPkCtqLKze2jdww==,type:str]
 sops:
     kms: []
     gcp_kms: []
-    lastmodified: '2017-11-02T21:33:42Z'
-    mac: ENC[AES256_GCM,data:VymC82E5SP0heF6IuG60BkZKg0CGZyLXaFkqZWNj7msYH1+vhVTJHt6Y2AdvcFNcazbEW5qUmn19aMm8YVb0Ph6ZLOhS8j+U9ClWe1PPaq7JiePDMaLFDCdrvLNPwE5rDFR2jeT7NxHxquUKoJDzZVPDakE0B9qzkcQRPaQQGYI=,iv:P3hy+OeIUeD4/dTmweZWhC9wLILPQutqGO+e7mpmyeI=,tag:A3fd/elRnZMbKh4t5hsShg==,type:str]
+    azure_kv: []
+    lastmodified: '2018-10-23T19:56:48Z'
+    mac: ENC[AES256_GCM,data:G3CDvgIIfGc9vE2Mz/Jr8lSoxjq2eqNgBmytGKP+R5/HZZGYuJFOLBm0hRmPWXxe88thPyXFArklvEjhPobyvYrYN93dph3O4SaoZvKeuv4DgNy9SZaI3jfXQGYEpsNQajJGulwL73STQBzw6sT/aG6uLzNEbIrgxb8VyahrAUI=,iv:ieDrjPaV6Nr5SY7TPPhlpKKzfxokDMz+SPU6TraZ7Vk=,tag:c2ObhWTIdSWr2VjG0CAOiw==,type:str]
     pgp:
-    -   created_at: '2017-11-02T21:33:41Z'
+    -   created_at: '2018-10-23T19:56:47Z'
         enc: |-
             -----BEGIN PGP MESSAGE-----
 
-            wcFMAxYpv4YXKfBAARAARZzY0Jaz8w2lTUuaMTE0ZqF1Q1ewjlyKt9DtefeO+JHc
-            gX7LUtcFKI6D/cGS3rYQFdM4k5d2hj9F+LJlp8uQJLY0nFcpOHemWzi0/7HfaZX2
-            vJtBIggkQi7p1IBRqTV/+uuZJ5QUeiqw1JmB+ieaAJXyvYHVVS0jjq3LwDWq2fcO
-            r+rv14FH7EDYKpSwD9EbgoS6fZHn8MO4LqTZet5XyEI3N11CztxxKDqxhH5u6npA
-            poh6ATksaBkBdELcuYLGYt4urc5buDa+1DgpCuyAIOW245p+i5y2pD6Dfqazp+5j
-            nAnEwyNvBxv+GC5+9FJSd0K6NqbTpx//PCpkHMwqsVSFwhMo0UGP3JJUnYVycN2u
-            ZRFUpof3lSi1dj0Bi4AyQfzqBNskSUqLHSgBoZcuDNHAP8Y+okkg4Y7ettmTD4Gr
-            AIt006bd7+ZzSSJraXCoEgjMipydW62cm0RxmlXapE3ENDKABM3Er1HWgp8+ntrv
-            alYeXcq0o6Kf/cZgo7/GqAUT4j6yl1iEnlczn1GNIPRQIocOX4kPpvaznKJkgHsB
-            OIr7RjRyLgMPak5p/4B1NESy116VJfEJD15l5OX9Q1H9MlTT1pJgdwpKtue0PjdZ
-            f3oz99MBdls2fZd1LB5VYGs5PB6OHPl214E4ZQ7MgT+OW9FDIstHdBXSUCM75/bS
-            4AHkNhYeR1mNtFS6aTwEr1Knx+E6veBo4Mbhe5rg/+Iw2IW64NXlMAyikizGyjwL
-            N5PojqVpvt+5SyWb6wqmNTU1ucCs0gngkeQGAD5QtVJbIypuA28ufEEL4utk0Yzh
-            EAoA
-            =ykPW
+            wcFMAxYpv4YXKfBAARAAoPFZY1Vrq7hABGE5NeFuezVOBJ2g31fdFkHKK792nU5D
+            k5IbInF11afAUdbxCEhX0cRN5OodoKC3v7fjUQfFBiDqC2qf4CczhWbvY605mfcD
+            4cX8dswD5kLx7RvaReE71IkmKTtvEwCRIs3nhVp0A5p1cSk0TRa9e8pLrcHUoa/i
+            QNQDAo76DChv4UJD9ix8GK34Wrm7SBmCcEzjpNgAKsl+RlpM6G0E12rjUaxnmCqz
+            Md4Gpqcx3rZhkJZWdiUufwTocM8zVKEPSNbloWBQbsZ1pFdO2OlZhP8ozpwfAana
+            eDEjjo4tX3MytyUonocpezCiyapWbexL0nl2yxsfHvCIwAzT8OwSxpNv1EI0AgwZ
+            dRWmvqVOjP6lAvJPm7yX8YZQQ2oDdHNABwDBXBgA+TCCUZGEk0sZhs5SRYGByPlO
+            2x83opqI7eJcbYMjaf4q+os7fEdPcgWPokOZ+ocfLmKQJ5JG5vHVXd+fF8jh9tTo
+            3xYjWx5AFkpW9Piqo9Hap9zjvo9xCXqnjMfp5AapMpJj6E6euB7UVTYivKRH5fUu
+            c4niT57NRkbudzcc1EliV7ih7g3h0N5B2i+RQaAsUo6GqH34a4MJU5GaTJpg5Y6O
+            25eMHLV9XstXMnx2mQV4d7EoqWmpwPjuIEsQqG20mIsQe9TiqjUunXzAUQgw/l7S
+            4AHkvZcs0xPp0AaOq55hTHl57OE+jeDT4Ivh1bbg3OKa8Q5Y4MzlVOgz/ct1qXmt
+            D6srwoLz8m2MpHptbo86CnJw+kcya1rgyeSalFFqjSrf/gOAvVZ54NUZ4iGaXpnh
+            I7wA
+            =814a
             -----END PGP MESSAGE-----
         fp: 4434EA5D05F10F59D0DF7399AF1D073646ED4927
-    -   created_at: '2017-11-02T21:33:41Z'
+    -   created_at: '2018-10-23T19:56:47Z'
         enc: |-
             -----BEGIN PGP MESSAGE-----
 
-            wcFMAxzSiC7ZHNQZARAAJcYeCBjZoYGiPlzEjmqenK3wo1AuGgWHbAX9z9tcVa0w
-            r3jRyXohRtkwXa0xgGwI1YUScXqKGLr1dDqT3wKgW0OoOQ17Tx2Km5nkomBzJX4l
-            +8s5Vgmqn4k9GkVBDoufYnIjKx/0+yImH364P3DMQ3M2HbADVokSGOI/lJizMVMJ
-            HZDKAFsHQ2OH+TbWY+9uPeJjVQdzqNssUf1n8wkf9opbYey4+SUmgC8IA+JGCASO
-            RonSj7x39/fBi1wpqZMkZBq0XISmvGfqLovS1FdyQ5Yl9jPKjU6mWqyl32aLOQe4
-            OBMNeLHYZ+fkdEuAi8YVqqsYrMGET6cBWRtiuzSIsMDnw3selqRmC4/awGOjbWvG
-            hGAkLdClT7helRSvYyov1lyMGVwy1+W0FoulaqoSZD+hRXCH+QvrchFgCY4oDUCa
-            BXm7G9Zbk3/6DBi4+rxlEO1y/R0nPjO/XfUZpMP7f3Hog9Eg7CC7hyyWsi4mgS93
-            2IZqtfs0EMSh7nxnIpgg80+e1iNPPkF5BBkNYuesVh7LOGweXKrLjQSJgfu5l6wr
-            dRKoB1IkT74pfZYrEkist647+XeNjjZ0PhRioRxbrWtD1cFVlS4nO6gcQ8EynEsX
-            jToYzYuCORnEQNNOF3wRbrsYMtisCt+MTtbP3V53YG2CBxpmGq4+DAfLwIOGkVLS
-            4AHk2sPNtwYWAIW2vYc7i2HfHeElmOCb4AbhE7HgPuJ4bqRD4K3l+x7Ksz8a833k
-            J8gZrgGLiS4Qg+TgPwUmJBA9vJj4a/zgmOToHGCuCi1/Ay6IdB5XV4yt4hull0Dh
-            E5kA
-            =JFP/
+            wcFMAxzSiC7ZHNQZARAAFtOmwPF0DCcJGUQsRD4bb8dMyomAbRcg0+n39NQSQQuy
+            knXvPcGw4+jo/rROedL669dBgROyA/GI+fKbnG/9fz1LsZxTTr44vQ65BixAVsuY
+            S7lVeR+Mdq0UHpHlm+tgzjVw4pzdcmfnQQJ45QwUGD5SKqABu+pcGiHlzNu4viG8
+            zsQo6umXsTGO32GqM2E/E7+s3SqbU/gJrB8UeLBr1vP1DNTHi94ZNFi4tF3GnQsg
+            2uwGJNF+WOwctwVaAWcbYdwuBdLtkmjCqXZqZe2MOgzKv8+D8UFGaVkGzScAcOeL
+            HbKBPBVUnZvWb+ExakSEmiOiLM1D4aJUfOhX+90ETQyESIbII7lUA5OzUxLIk8cM
+            vrihEkD25Gpv8UVIJHjbYFg7aRLdNt+52SsKdSmy92268fwsRBFNTQCeIlvihnTa
+            QujoB7eew+b9Zq5Iag4VhwfD2AzID9T5x6vfZL4qi9plXbhpWGG+7Pf/9NaYnoYJ
+            J9hfNmsR/4zx0D3Xp2nJPPemVmikMiIYlslQ0V1/fVS14/e6sTlg6hjkQQuk68oH
+            h1Es+0bul9NxXo30K7y6Q3ioCUVDdXCcGQ2zzh7G96beWfZHxi3gBeu3filmoaok
+            E0iu3vQIq3fb3T03xerrz2d2CjgdwY4rmCnJ8Ny0N/0B5Xo9LTX+UesrnO4WusnS
+            4AHkzsOOWsX2zoP9uY4cdx6XBeGCZOCj4NzhOXbg8eKqR+OP4NLly2T8AhthlqbQ
+            N1FnRbsYmATr2NppvT9djuhILmL0uELgr+SnxPpwQI4x2Jhh1p9J7p2J4gXf4Dnh
+            FTUA
+            =l0Z2
             -----END PGP MESSAGE-----
         fp: 40B6FAEC80FD467E3FE9421019F6A67BB1B8DDBE
     unencrypted_suffix: _unencrypted
-    version: 3.0.0
+    version: 3.1.1
diff --git a/secrets.sh b/secrets.sh
index da3981c..9d8b9f9 100755
--- a/secrets.sh
+++ b/secrets.sh
@@ -223,11 +223,12 @@ encrypt_helper() {
     fi
     if [[ $yml == $ymldec ]]
     then
-	sops --encrypt --input-type yaml --output-type yaml --in-place "$yml"
+	sops --encrypt --input-type yaml --output-type yaml --in-place "$yml" && \
 	echo "Encrypted $yml"
     else
-	sops --encrypt --input-type yaml --output-type yaml "$ymldec" > "$yml"
-	echo "Encrypted $ymldec to $yml"
+	sops --encrypt --input-type yaml --output-type yaml "$ymldec" > "$yml" && \
+	echo "Encrypted $ymldec to $yml" && \
+	rm $ymldec
     fi
 }
 
@@ -339,10 +340,11 @@ clean() {
 	return
     fi
     local basedir="$1"
-    find "$basedir" -type f -name "secrets*${DEC_SUFFIX}" -print0 | xargs -r0 rm -v
+    find "$basedir" -type f -name "secrets*${DEC_SUFFIX}" -print -exec rm {} \;
 }
 
 helm_wrapper() {
+    trap 'last_error_code=$?' ERR
     local cmd="$1" subcmd='' cmd_version=''
     shift
     if [[ $cmd == diff ]]
@@ -395,7 +397,7 @@ EOF
 	case "$1" in
 	    --)
 		# skip --, and what remains are the cmd args
-		shift 
+		shift
 		break
 		;;
             -f|--values)
@@ -424,6 +426,9 @@ EOF
 
     # cleanup on-the-fly decrypted files
     [[ ${#decfiles[@]} -gt 0 ]] && rm -v "${decfiles[@]}"
+
+    exit $last_error_code
+
 }
 
 helm_command() {
diff --git a/test.sh b/test.sh
index 85d4d7f..8d63544 100755
--- a/test.sh
+++ b/test.sh
@@ -91,7 +91,7 @@ echo -e "${YELLOW}+++${NOC} Encrypt and Test"
 test_encryption "${secret}"
 
 echo -e "${YELLOW}+++${NOC} Test if 'Already Encrypted' feature works"
-enc_res=$("${HELM_CMD}" secrets enc "${secret}" | grep "${ALREADY_ENC}")
+enc_res=$("${HELM_CMD}" secrets enc "${secret}" | grep -i "${ALREADY_ENC}")
 test_already_encrypted "${enc_res}"
 
 echo -e "${YELLOW}+++${NOC} View encrypted Test"