diff --git a/Gemfile b/Gemfile
index f1d03f8a8..7ad72f5fa 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: 'master'
 gem 'domain_name'
 gem 'haml', '~> 5.0'
 gem 'wkhtmltopdf-binary', '~> 0.12.5.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index dcf62a343..7b18612e0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -45,11 +45,10 @@ GIT
 
 GIT
   remote: https://github.com/internetee/lhv.git
-  revision: c53dd82393f8a81f6e9da793ae0474294ef88762
+  revision: 1825240b3bf8b262418cc6c8ef7ed1aba386dd7d
   branch: master
   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/config/application.yml.sample b/config/application.yml.sample
index 8f71d75d8..2cd19b768 100644
--- a/config/application.yml.sample
+++ b/config/application.yml.sample
@@ -148,9 +148,8 @@ action_mailer_default_port: # default: no port (80)
 action_mailer_default_from: # no-reply@example.com
 action_mailer_force_delete_from: # `From` header for `DomainDeleteMailer#forced` email
 
-lhv_keystore:
+lhv_p12_keystore:
 lhv_keystore_password:
-lhv_keystore_alias:
 lhv_ca_file: # Needed only in dev mode
 lhv_dev_mode: 'false'
 
@@ -163,9 +162,8 @@ test:
   action_mailer_default_host: 'registry.test'
   action_mailer_default_from: 'no-reply@registry.test'
   action_mailer_force_delete_from: 'legal@registry.test'
-  lhv_keystore: 'test/fixtures/files/keystore.jks'
+  lhv_p12_keystore: 'test/fixtures/files/keystore.p12'
   lhv_keystore_password: 'testtest'
-  lhv_keystore_alias: 'testtest'
   legal_documents_dir: 'test/fixtures/files'
 
 # Airbrake // Errbit:
diff --git a/lib/tasks/dev/create_bank_transactions/create_bank_transactions.rake b/lib/tasks/dev/create_bank_transactions/create_bank_transactions.rake
index 33614d049..17b7586e2 100644
--- a/lib/tasks/dev/create_bank_transactions/create_bank_transactions.rake
+++ b/lib/tasks/dev/create_bank_transactions/create_bank_transactions.rake
@@ -3,12 +3,9 @@ namespace :dev do
     remitter_iban = ENV['remitter_iban']
     beneficiary_iban = Setting.registry_iban
 
-    keystore_password = ENV['lhv_keystore_password']
-    keystore_alias = ENV['lhv_keystore_alias']
-    keystore = Keystores::JavaKeystore.new
-    keystore.load(ENV['lhv_keystore'], keystore_password)
-    cert = keystore.get_certificate(keystore_alias)
-    key = keystore.get_key(keystore_alias, keystore_password)
+    keystore = OpenSSL::PKCS12.new(File.read(ENV['lhv_p12_keystore']), ENV['lhv_keystore_password'])
+    key = keystore.key
+    cert = keystore.certificate
 
     api_base_uri = URI.parse('https://testconnect.lhv.eu/connect-prelive')
     request_headers = { 'content-type' => 'application/xml' }
@@ -38,4 +35,4 @@ namespace :dev do
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/lib/tasks/invoices/process_payments.rake b/lib/tasks/invoices/process_payments.rake
index 6e4c57213..340aba187 100644
--- a/lib/tasks/invoices/process_payments.rake
+++ b/lib/tasks/invoices/process_payments.rake
@@ -2,12 +2,9 @@ namespace :invoices do
   task process_payments: :environment do
     registry_bank_account_iban = Setting.registry_iban
 
-    keystore_password = ENV['lhv_keystore_password']
-    keystore_alias = ENV['lhv_keystore_alias']
-    keystore = Keystores::JavaKeystore.new
-    keystore.load(ENV['lhv_keystore'], keystore_password)
-    cert = keystore.get_certificate(keystore_alias)
-    key = keystore.get_key(keystore_alias, keystore_password)
+    keystore = OpenSSL::PKCS12.new(File.read(ENV['lhv_p12_keystore']), ENV['lhv_keystore_password'])
+    key = keystore.key
+    cert = keystore.certificate
 
     api = Lhv::ConnectApi.new
     api.cert = cert
@@ -46,4 +43,4 @@ namespace :invoices do
 
     puts "Transactions processed: #{incoming_transactions.size}"
   end
-end
\ No newline at end of file
+end
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
diff --git a/test/tasks/invoices/process_payments_test.rb b/test/tasks/invoices/process_payments_test.rb
index 02855e9fa..bd447be29 100644
--- a/test/tasks/invoices/process_payments_test.rb
+++ b/test/tasks/invoices/process_payments_test.rb
@@ -88,6 +88,12 @@ class ProcessPaymentsTaskTest < ActiveSupport::TestCase
     end
   end
 
+  def test_parses_keystore_properly
+    assert_nothing_raised do
+      run_task
+    end
+  end
+
   private
 
   def run_task