diff --git a/Gemfile b/Gemfile
index 99091f556..b78d2edbd 100644
--- a/Gemfile
+++ b/Gemfile
@@ -66,7 +66,7 @@ gem 'airbrake'
 
 gem 'company_register', github: 'internetee/company_register', branch: :master
 gem 'e_invoice', github: 'internetee/e_invoice', branch: :master
-gem 'lhv', github: 'internetee/lhv', branch: :master
+gem 'lhv', github: 'internetee/lhv', branch: 'remove-keystores-gem'
 gem 'domain_name'
 gem 'haml', '~> 5.0'
 gem 'wkhtmltopdf-binary', '~> 0.12.5.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index e4ad26396..8d303b602 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -45,11 +45,10 @@ GIT
 
 GIT
   remote: https://github.com/internetee/lhv.git
-  revision: c53dd82393f8a81f6e9da793ae0474294ef88762
-  branch: master
+  revision: af0d3127bed6606ac50c44696bd56b09c096ac39
+  branch: remove-keystores-gem
   specs:
     lhv (0.1.0)
-      keystores
       logger
       nokogiri
 
@@ -266,7 +265,6 @@ GEM
       activerecord
       kaminari-core (= 1.2.1)
     kaminari-core (1.2.1)
-    keystores (0.4.0)
     libxml-ruby (3.2.0)
     listen (3.2.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
diff --git a/test/fixtures/files/keystore.jks b/test/fixtures/files/keystore.jks
deleted file mode 100644
index 7ce34f308..000000000
Binary files a/test/fixtures/files/keystore.jks and /dev/null differ
diff --git a/test/fixtures/files/keystore.p12 b/test/fixtures/files/keystore.p12
new file mode 100644
index 000000000..962ddede2
Binary files /dev/null and b/test/fixtures/files/keystore.p12 differ