diff --git a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/src/com/adyen/v6/controllers/pages/AdyenSummaryCheckoutStepController.java b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/src/com/adyen/v6/controllers/pages/AdyenSummaryCheckoutStepController.java
index c21db4b6a..73449dd1e 100644
--- a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/src/com/adyen/v6/controllers/pages/AdyenSummaryCheckoutStepController.java
+++ b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/src/com/adyen/v6/controllers/pages/AdyenSummaryCheckoutStepController.java
@@ -22,6 +22,7 @@
 
 import java.net.UnknownHostException;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Set;
 import javax.annotation.Resource;
@@ -81,7 +82,7 @@
 import static com.adyen.v6.constants.Adyenv6coreConstants.RATEPAY;
 import static com.adyen.v6.constants.Adyenv6coreConstants.PAYMENT_METHOD_MULTIBANCO;
 import static com.adyen.v6.facades.DefaultAdyenCheckoutFacade.MODEL_CHECKOUT_SHOPPER_HOST;
-import static com.adyen.v6.facades.DefaultAdyenCheckoutFacade.MODEL_ORIGIN_KEY;
+import static com.adyen.v6.facades.DefaultAdyenCheckoutFacade.MODEL_ENVIRONMENT_MODE;
 
 @Controller
 @RequestMapping(value = AdyenControllerConstants.SUMMARY_CHECKOUT_PREFIX)
@@ -92,6 +93,7 @@ public class AdyenSummaryCheckoutStepController extends AbstractCheckoutStepCont
     private static final String AUTHORISE_3D_SECURE_PAYMENT_URL = "/authorise-3d-adyen-response";
     private static final String HPP_RESULT_URL = "/hpp-adyen-response";
     private static final String ADYEN_PAYLOAD = "payload";
+    private static final String REDIRECT_RESULT = "redirectResult";
 
     @Resource(name = "siteBaseUrlResolutionService")
     private SiteBaseUrlResolutionService siteBaseUrlResolutionService;
@@ -208,20 +210,20 @@ public String placeOrder(@ModelAttribute("placeOrderForm") final PlaceOrderForm
                     errorMessage = getErrorMessageByRefusalReason(paymentsResponse.getRefusalReason());
                 }
                 if (IDENTIFYSHOPPER == paymentsResponse.getResultCode()) {
-                    if (adyenPaymentMethod.equals(PAYMENT_METHOD_CC)|| adyenPaymentMethod.indexOf(PAYMENT_METHOD_ONECLICK) == 0) {
+                    if (adyenPaymentMethod.equals(PAYMENT_METHOD_CC) || adyenPaymentMethod.indexOf(PAYMENT_METHOD_ONECLICK) == 0) {
                         model.addAttribute(MODEL_CHECKOUT_SHOPPER_HOST, adyenCheckoutFacade.getCheckoutShopperHost());
+                        model.addAttribute(MODEL_ENVIRONMENT_MODE, adyenCheckoutFacade.getEnvironmentMode());
                         model.addAttribute(SHOPPER_LOCALE, adyenCheckoutFacade.getShopperLocale());
-                        model.addAttribute(MODEL_ORIGIN_KEY, adyenCheckoutFacade.getOriginKey());
                         model.addAttribute(PAYMENT_DATA, paymentsResponse.getPaymentData());
                         model.addAttribute(FINGERPRINT_TOKEN, paymentsResponse.getAuthentication().get(THREEDS2_FINGERPRINT_TOKEN));
                         return AdyenControllerConstants.Views.Pages.MultiStepCheckout.Validate3DS2PaymentPage;
                     }
                 }
                 if (CHALLENGESHOPPER == paymentsResponse.getResultCode()) {
-                    if (adyenPaymentMethod.equals(PAYMENT_METHOD_CC)|| adyenPaymentMethod.indexOf(PAYMENT_METHOD_ONECLICK) == 0) {
+                    if (adyenPaymentMethod.equals(PAYMENT_METHOD_CC) || adyenPaymentMethod.indexOf(PAYMENT_METHOD_ONECLICK) == 0) {
                         model.addAttribute(MODEL_CHECKOUT_SHOPPER_HOST, adyenCheckoutFacade.getCheckoutShopperHost());
+                        model.addAttribute(MODEL_ENVIRONMENT_MODE, adyenCheckoutFacade.getEnvironmentMode());
                         model.addAttribute(SHOPPER_LOCALE, adyenCheckoutFacade.getShopperLocale());
-                        model.addAttribute(MODEL_ORIGIN_KEY, adyenCheckoutFacade.getOriginKey());
                         model.addAttribute(PAYMENT_DATA, paymentsResponse.getPaymentData());
                         model.addAttribute(CHALLENGE_TOKEN, paymentsResponse.getAuthentication().get(THREEDS2_CHALLENGE_TOKEN));
                         return AdyenControllerConstants.Views.Pages.MultiStepCheckout.Validate3DS2PaymentPage;
@@ -251,8 +253,8 @@ public String authorise3DS2Payment(final Model model,
             PaymentsResponse paymentsResponse = e.getPaymentsResponse();
             if (paymentsResponse != null && paymentsResponse.getResultCode() == CHALLENGESHOPPER) {
                 model.addAttribute(MODEL_CHECKOUT_SHOPPER_HOST, adyenCheckoutFacade.getCheckoutShopperHost());
+                model.addAttribute(MODEL_ENVIRONMENT_MODE, adyenCheckoutFacade.getEnvironmentMode());
                 model.addAttribute(SHOPPER_LOCALE, adyenCheckoutFacade.getShopperLocale());
-                model.addAttribute(MODEL_ORIGIN_KEY, adyenCheckoutFacade.getOriginKey());
                 model.addAttribute(PAYMENT_DATA, paymentsResponse.getPaymentData());
                 model.addAttribute(CHALLENGE_TOKEN, paymentsResponse.getAuthentication().get("threeds2.challengeToken"));
                 return AdyenControllerConstants.Views.Pages.MultiStepCheckout.Validate3DS2PaymentPage;
@@ -264,7 +266,7 @@ public String authorise3DS2Payment(final Model model,
             LOGGER.debug("Redirecting to summary" + errorMessage);
             return redirectToSummaryWithError(redirectModel, errorMessage);
         }
-        LOGGER.debug("Redirecting to final step of checkout" +errorMessage);
+        LOGGER.debug("Redirecting to final step of checkout" + errorMessage);
         return redirectToSummaryWithError(redirectModel, errorMessage);
     }
 
@@ -298,11 +300,19 @@ public String authorise3DSecurePayment(final Model model,
     @RequestMapping(value = HPP_RESULT_URL, method = RequestMethod.GET)
     @RequireHardLogIn
     public String handleAdyenResponse(final HttpServletRequest request, final RedirectAttributes redirectModel) {
-        //Compose HPP response data map
         String payload = request.getParameter(ADYEN_PAYLOAD);
+        String redirectResult = request.getParameter(REDIRECT_RESULT);
+        HashMap<String, String> details = new HashMap<>();
+
+        if (payload != null && ! payload.isEmpty()) {
+            details.put(ADYEN_PAYLOAD, payload);
+        }
+        if (redirectResult != null && ! redirectResult.isEmpty()) {
+            details.put(REDIRECT_RESULT, redirectResult);
+        }
 
         try {
-            PaymentsResponse response = adyenCheckoutFacade.handleRedirectPayload(payload);
+            PaymentsResponse response = adyenCheckoutFacade.handleRedirectPayload(details);
 
             switch (response.getResultCode()) {
                 case AUTHORISED:
@@ -352,12 +362,20 @@ private void addMultibancoMessage(RedirectAttributes redirectModel, final String
 
         GlobalMessages.addFlashMessage(redirectModel,
                                        GlobalMessages.INFO_MESSAGES_HOLDER,
-                                       "<p> Multibanco order summary " + "</p>" +
-                                       "<p> Amount: "  + orderData.getAdyenMultibancoAmount() + "</p>"
-                                               + "<p> Entity: "  + orderData.getAdyenMultibancoEntity() + "</p>"
-                                               + "<p> Deadline: "  + orderData.getAdyenMultibancoDeadline() + "</p>"
-                                               + "<p> Reference: "  + orderData.getAdyenMultibancoReference() + "</p>"
-        );
+                                       "<p> Multibanco order summary "
+                                               + "</p>"
+                                               + "<p> Amount: "
+                                               + orderData.getAdyenMultibancoAmount()
+                                               + "</p>"
+                                               + "<p> Entity: "
+                                               + orderData.getAdyenMultibancoEntity()
+                                               + "</p>"
+                                               + "<p> Deadline: "
+                                               + orderData.getAdyenMultibancoDeadline()
+                                               + "</p>"
+                                               + "<p> Reference: "
+                                               + orderData.getAdyenMultibancoReference()
+                                               + "</p>");
     }
 
     /**
diff --git a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/src/com/adyen/v6/controllers/pages/checkout/steps/SelectPaymentMethodCheckoutStepController.java b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/src/com/adyen/v6/controllers/pages/checkout/steps/SelectPaymentMethodCheckoutStepController.java
index 8243b8d6f..1fc78f169 100644
--- a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/src/com/adyen/v6/controllers/pages/checkout/steps/SelectPaymentMethodCheckoutStepController.java
+++ b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/src/com/adyen/v6/controllers/pages/checkout/steps/SelectPaymentMethodCheckoutStepController.java
@@ -20,6 +20,7 @@
  */
 package com.adyen.v6.controllers.pages.checkout.steps;
 
+import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -27,13 +28,17 @@
 import java.util.GregorianCalendar;
 import java.util.List;
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
+import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.apache.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+import com.adyen.service.exception.ApiException;
 import com.adyen.v6.constants.AdyenControllerConstants;
 import com.adyen.v6.facades.AdyenCheckoutFacade;
 import com.adyen.v6.forms.AdyenPaymentForm;
@@ -44,6 +49,7 @@
 import de.hybris.platform.cms2.exceptions.CMSItemNotFoundException;
 import de.hybris.platform.cms2.model.pages.ContentPageModel;
 import de.hybris.platform.commercefacades.order.data.CartData;
+import static com.adyen.v6.facades.DefaultAdyenCheckoutFacade.MODEL_ORIGIN_KEY;
 import static de.hybris.platform.acceleratorstorefrontcommons.constants.WebConstants.BREADCRUMBS_KEY;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
 import static org.springframework.web.bind.annotation.RequestMethod.POST;
@@ -65,6 +71,9 @@ public class SelectPaymentMethodCheckoutStepController extends AbstractCheckoutS
     @Resource(name = "adyenCheckoutFacade")
     private AdyenCheckoutFacade adyenCheckoutFacade;
 
+    @Autowired
+    private HttpServletRequest httpServletRequest;
+
     /**
      * {@inheritDoc}
      */
@@ -84,6 +93,14 @@ public String enterStep(final Model model, final RedirectAttributes redirectAttr
         model.addAttribute(CART_DATA_ATTR, cartData);
         model.addAttribute("expiryYears", getExpiryYears());
 
+        try {
+            model.addAttribute(MODEL_ORIGIN_KEY, adyenCheckoutFacade.getOriginKey(httpServletRequest));
+        } catch (IOException e) {
+            LOGGER.error("Exception occurred during getting the origin key" + ExceptionUtils.getStackTrace(e));
+        } catch (ApiException e) {
+            LOGGER.error("Exception occurred during getting origin key" + ExceptionUtils.getStackTrace(e));
+        }
+
         adyenCheckoutFacade.initializeCheckoutData(model);
 
         super.prepareDataForPage(model);
diff --git a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/views/responsive/pages/checkout/multi/3ds2_payment.jsp b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/views/responsive/pages/checkout/multi/3ds2_payment.jsp
index 57b307413..4be001050 100644
--- a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/views/responsive/pages/checkout/multi/3ds2_payment.jsp
+++ b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/views/responsive/pages/checkout/multi/3ds2_payment.jsp
@@ -3,16 +3,15 @@
 <html>
 <head>
 
-    <script type="text/javascript" src="https://${checkoutShopperHost}/checkoutshopper/sdk/2.5.0/adyen.js"></script>
-    <link rel="stylesheet" href="https://${checkoutShopperHost}/checkoutshopper/sdk/2.5.0/adyen.css"/>
+    <script type="text/javascript" src="https://${checkoutShopperHost}/checkoutshopper/sdk/3.0.0/adyen.js"></script>
+    <link rel="stylesheet" href="https://${checkoutShopperHost}/checkoutshopper/sdk/3.0.0/adyen.css"/>
 
     <script type="text/javascript">
 
-        function initiateCheckout ( locale, loadingContext, originKey ) {
+        function initiateCheckout ( locale, environmentMode ) {
             var configuration = {
                 locale: locale,// shopper's locale
-                loadingContext: loadingContext,
-                originKey: originKey,
+                environment: environmentMode, //test or live
                 risk: {
                     enabled: false
                 }
@@ -21,7 +20,7 @@
         }
 
         function perform3DS2Operations () {
-            initiateCheckout( "${shopperLocale}", "https://${checkoutShopperHost}/checkoutshopper/", "${originKey}" );
+            initiateCheckout( "${shopperLocale}", "${environmentMode}" );
             var challengeToken = "${challengeToken}";
             var fingerprintToken = "${fingerprintToken}";
             if ( challengeToken ) {
diff --git a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/views/responsive/pages/checkout/multi/selectPaymentMethodPage.jsp b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/views/responsive/pages/checkout/multi/selectPaymentMethodPage.jsp
index 1de2c6d57..0c6c70b7f 100644
--- a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/views/responsive/pages/checkout/multi/selectPaymentMethodPage.jsp
+++ b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/views/responsive/pages/checkout/multi/selectPaymentMethodPage.jsp
@@ -17,12 +17,12 @@
 <template:page pageTitle="${pageTitle}" hideHeaderLinks="true">
     <jsp:attribute name="pageScripts">
         <script type="text/javascript" src="${dfUrl}"></script>
-        <script type="text/javascript" src="https://${checkoutShopperHost}/checkoutshopper/sdk/2.5.0/adyen.js"></script>
+        <script type="text/javascript" src="https://${checkoutShopperHost}/checkoutshopper/sdk/3.0.0/adyen.js"></script>
         <link rel="stylesheet" href="https://checkoutshopper-live.adyen.com/checkoutshopper/css/chckt-default-v1.css"/>
-        <link rel="stylesheet" href="https://${checkoutShopperHost}/checkoutshopper/sdk/2.5.0/adyen.css"/>
+        <link rel="stylesheet" href="https://${checkoutShopperHost}/checkoutshopper/sdk/3.0.0/adyen.css"/>
 
         <script type="text/javascript">
-            AdyenCheckoutHybris.initiateCheckout("${shopperLocale}", "https://${checkoutShopperHost}/checkoutshopper/", "${originKey}" );
+            AdyenCheckoutHybris.initiateCheckout("${shopperLocale}", "${environmentMode}", "${originKey}" );
 
             <c:if test="${not empty allowedCards}">
             //Set the allowed cards
diff --git a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/_ui/responsive/common/js/adyen.checkout.js b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/_ui/responsive/common/js/adyen.checkout.js
index ab7458482..95849d7e7 100644
--- a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/_ui/responsive/common/js/adyen.checkout.js
+++ b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/_ui/responsive/common/js/adyen.checkout.js
@@ -25,7 +25,7 @@ var AdyenCheckoutHybris = (function () {
 
             // Check if it is a valid card and encrypt
             if ( paymentMethod === "adyen_cc" ) {
-                if (!this.card.isValid()) {
+                if (!this.card.isValid) {
                     window.alert('This credit card is not allowed');
                     return false;
                 }
@@ -36,7 +36,7 @@ var AdyenCheckoutHybris = (function () {
                 var recurringReference = paymentMethod.slice("adyen_oneclick_".length);
                 var oneClickCard = this.oneClickCards[recurringReference];
 
-                if (!(oneClickCard && oneClickCard.isValid())) {
+                if (!(oneClickCard && oneClickCard.isValid)) {
                     window.alert('This credit card is not allowed');
                     return false;
                 }
@@ -44,7 +44,7 @@ var AdyenCheckoutHybris = (function () {
                     this.copyOneClickCardDataBCMC( recurringReference )
                 }
                 else {
-                    this.copyOneClickCardData( recurringReference, oneClickCard.state.data.encryptedSecurityCode );
+                    this.copyOneClickCardData( recurringReference, oneClickCard.data.paymentMethod.encryptedSecurityCode );
                 }
             }
 
@@ -54,14 +54,14 @@ var AdyenCheckoutHybris = (function () {
         },
 
         copyCardData: function() {
-            var state = this.card.state.data;
+            var state = this.card.data.paymentMethod;
             $( 'input[name="encryptedCardNumber"]' ).val( state.encryptedCardNumber );
             $( 'input[name="encryptedExpiryMonth"]' ).val( state.encryptedExpiryMonth );
             $( 'input[name="encryptedExpiryYear"]' ).val( state.encryptedExpiryYear );
             $( 'input[name="encryptedSecurityCode"]' ).val( state.encryptedSecurityCode );
             $( 'input[name="cardHolder"]' ).val( state.holderName );
-            if(state.storeDetails!=null){
-            $( 'input[name="rememberTheseDetails"]' ).val( state.storeDetails );}
+            if(this.card.data.storePaymentMethod!=null){
+            $( 'input[name="rememberTheseDetails"]' ).val( this.card.data.storePaymentMethod );}
 
         },
 
@@ -118,10 +118,10 @@ var AdyenCheckoutHybris = (function () {
         createDfValue: function () {
             window.dfDo( "dfValue" );
         },
-        initiateCheckout: function ( locale, loadingContext, originKey ) {
+        initiateCheckout: function ( locale, environment, originKey ) {
             var configuration = {
                 locale: locale,// shopper's locale
-                loadingContext: loadingContext,
+                environment: environment,
                 originKey: originKey,
                 risk: {
                     enabled: false
@@ -180,7 +180,7 @@ var AdyenCheckoutHybris = (function () {
 
             function handleChange(event) {
                 var issuerIdField = document.getElementById('issuerId');
-                var issuerId = event.data.issuer;
+                var issuerId = event.data.paymentMethod.issuer;
                 issuerIdField.value = issuerId;
             }
 
diff --git a/adyenv6b2ccheckoutaddon/resources/adyenv6b2ccheckoutaddon.build.number b/adyenv6b2ccheckoutaddon/resources/adyenv6b2ccheckoutaddon.build.number
index 82931e5e4..51eef7afb 100644
--- a/adyenv6b2ccheckoutaddon/resources/adyenv6b2ccheckoutaddon.build.number
+++ b/adyenv6b2ccheckoutaddon/resources/adyenv6b2ccheckoutaddon.build.number
@@ -7,5 +7,5 @@ module.name=platform-module
 name=adyenv6b2ccheckoutaddon
 releasedate=20170509 1903
 vendor=adyen
-version=5.0.0
-version.api=5.0.0
\ No newline at end of file
+version=6.0.0
+version.api=6.0.0
\ No newline at end of file
diff --git a/adyenv6backoffice/resources/adyenv6backoffice-backoffice-config.xml b/adyenv6backoffice/resources/adyenv6backoffice-backoffice-config.xml
index e3398940f..88f8d2e08 100644
--- a/adyenv6backoffice/resources/adyenv6backoffice-backoffice-config.xml
+++ b/adyenv6backoffice/resources/adyenv6backoffice-backoffice-config.xml
@@ -28,11 +28,10 @@
                     <editorArea:attribute qualifier="adyenRecurringContractMode"/>
 					<editorArea:attribute qualifier="adyenTestMode"/>
                 </editorArea:section>
-				<editorArea:section name="hmc.adyen.api">
-					<editorArea:attribute qualifier="adyenAPIEndpointPrefix"/>
-					<editorArea:attribute qualifier="adyenAPIKey" editor="com.hybris.cockpitng.editor.defaultpassword"/>
-					<editorArea:attribute qualifier="adyenOriginKey"/>
-				</editorArea:section>
+                <editorArea:section name="hmc.adyen.api">
+                    <editorArea:attribute qualifier="adyenAPIEndpointPrefix"/>
+                    <editorArea:attribute qualifier="adyenAPIKey" editor="com.hybris.cockpitng.editor.defaultpassword"/>
+                </editorArea:section>
 				<editorArea:section name="hmc.adyen.hpp">
 					<editorArea:attribute qualifier="adyenSkinCode"/>
 					<editorArea:attribute qualifier="adyenSkinHMAC" editor="com.hybris.cockpitng.editor.defaultpassword"/>
diff --git a/adyenv6backoffice/resources/adyenv6backoffice.build.number b/adyenv6backoffice/resources/adyenv6backoffice.build.number
index 31daf5721..2730a44f3 100644
--- a/adyenv6backoffice/resources/adyenv6backoffice.build.number
+++ b/adyenv6backoffice/resources/adyenv6backoffice.build.number
@@ -7,5 +7,5 @@ module.name=platform-module
 name=adyenv6backoffice
 releasedate=20170509 1903
 vendor=adyen
-version=5.0.0
-version.api=5.0.0
\ No newline at end of file
+version=6.0.0
+version.api=6.0.0
\ No newline at end of file
diff --git a/adyenv6core/lib/adyen-java-api-library-2.1.0-rc.jar b/adyenv6core/lib/adyen-java-api-library-2.1.0-rc.jar
deleted file mode 100644
index a995420a0..000000000
Binary files a/adyenv6core/lib/adyen-java-api-library-2.1.0-rc.jar and /dev/null differ
diff --git a/adyenv6core/lib/adyen-java-api-library-2.4.1.jar b/adyenv6core/lib/adyen-java-api-library-2.4.1.jar
new file mode 100644
index 000000000..dbd42338e
Binary files /dev/null and b/adyenv6core/lib/adyen-java-api-library-2.4.1.jar differ
diff --git a/adyenv6core/resources/adyenv6core-items.xml b/adyenv6core/resources/adyenv6core-items.xml
index 9109adc28..0d848af3c 100644
--- a/adyenv6core/resources/adyenv6core-items.xml
+++ b/adyenv6core/resources/adyenv6core-items.xml
@@ -161,14 +161,6 @@
                     <description>Merchant account name</description>
                     <persistence type="property"/>
                 </attribute>
-                <attribute qualifier="adyenOriginKey" type="java.lang.String">
-                    <description>WS User Origin key</description>
-                    <persistence type="property">
-                        <columntype>
-                            <value>HYBRIS.LONG_STRING</value>
-                        </columntype>
-                    </persistence>
-                </attribute>
                 <attribute qualifier="adyenSkinCode" type="java.lang.String">
                     <description>HPP skin code</description>
                     <persistence type="property"/>
diff --git a/adyenv6core/resources/adyenv6core.build.number b/adyenv6core/resources/adyenv6core.build.number
index 2466c2569..12ca8363b 100644
--- a/adyenv6core/resources/adyenv6core.build.number
+++ b/adyenv6core/resources/adyenv6core.build.number
@@ -6,5 +6,5 @@ group.id=com.adyen.v6
 module.name=platform-module
 name=adyenv6core
 vendor=adyen
-version=5.0.0
-version.api=5.0.0
\ No newline at end of file
+version=6.0.0
+version.api=6.0.0
\ No newline at end of file
diff --git a/adyenv6core/resources/localization/adyenv6core-locales_en.properties b/adyenv6core/resources/localization/adyenv6core-locales_en.properties
index 5d7e448a1..402791ced 100644
--- a/adyenv6core/resources/localization/adyenv6core-locales_en.properties
+++ b/adyenv6core/resources/localization/adyenv6core-locales_en.properties
@@ -24,8 +24,6 @@ type.basestore.adyenNotificationPassword.name=Server Communication HTTP Basic pa
 type.basestore.adyenNotificationPassword.description=Set your own password and copy it over to Adyen Customer Area => Settings => Server Communication => Standard Notification => Password.
 type.basestore.adyenMerchantAccount.name=Merchant account name
 type.basestore.adyenMerchantAccount.description=The merchant account identifier you want to process the (transaction) request with. Find this at the top of the screen in the Adyen Customer Area (CA), where you will see [YourCompanyAccount] > [YourMerchantAccount] .
-type.basestore.adyenOriginKey.name=WS User Origin Key
-type.basestore.adyenOriginKey.description=Copy this from the Adyen Customer Area > Settings > Users > System (from the dropdown) > [web service user] > Origin key.
 type.basestore.adyenSkinCode.name=HPP skin code
 type.basestore.adyenSkinCode.description=Copy and paste the skin code of the skin you want to use from Customer Area => Skins. Leave empty to disable Alternative Payment Methods.
 type.basestore.adyenSkinHMAC.name=HPP skin HMAC key
diff --git a/adyenv6core/src/com/adyen/v6/constants/Adyenv6coreConstants.java b/adyenv6core/src/com/adyen/v6/constants/Adyenv6coreConstants.java
index cf38a6524..388018a53 100644
--- a/adyenv6core/src/com/adyen/v6/constants/Adyenv6coreConstants.java
+++ b/adyenv6core/src/com/adyen/v6/constants/Adyenv6coreConstants.java
@@ -31,8 +31,9 @@ public final class Adyenv6coreConstants extends GeneratedAdyenv6coreConstants {
 	public static final String EXTENSIONNAME = "adyenv6core";
 
 	public static final String PLUGIN_NAME = "adyen-hybris";
-	public static final String PLUGIN_VERSION = "5.0.0";
+	public static final String PLUGIN_VERSION = "6.0.0";
 	public static final String PAYMENT_PROVIDER = "Adyen";
+	public static final String PAYMENT_METHOD ="paymentMethod";
 
 	final public static String PAYMENT_METHOD_CC = "adyen_cc";
 	final public static String PAYMENT_METHOD_IDEAL = "ideal";
diff --git a/adyenv6core/src/com/adyen/v6/facades/AdyenCheckoutFacade.java b/adyenv6core/src/com/adyen/v6/facades/AdyenCheckoutFacade.java
index 30a4344dc..9dde937d0 100644
--- a/adyenv6core/src/com/adyen/v6/facades/AdyenCheckoutFacade.java
+++ b/adyenv6core/src/com/adyen/v6/facades/AdyenCheckoutFacade.java
@@ -22,6 +22,7 @@
 
 import java.io.IOException;
 import java.security.SignatureException;
+import java.util.HashMap;
 import java.util.Map;
 import java.util.SortedMap;
 import javax.servlet.http.HttpServletRequest;
@@ -62,7 +63,7 @@ public interface AdyenCheckoutFacade {
     /**
      * Retrieve the WS User Origin Key
      */
-    String getOriginKey();
+    String getOriginKey(HttpServletRequest request) throws IOException, ApiException;
 
     String getShopperLocale();
 
@@ -71,6 +72,11 @@ public interface AdyenCheckoutFacade {
      */
     String getCheckoutShopperHost();
 
+    /**
+     * Retrieve the environment is running in test mode or live mode
+     */
+    String getEnvironmentMode();
+
     /**
      * Retrieve the HPP base URL for the current basestore
      *
@@ -105,10 +111,10 @@ public interface AdyenCheckoutFacade {
      * Handles Adyen Redirect Response
      * In case of authorized, it places an order from cart
      *
-     * @param payload included in querystring of response
+     * @param details consisting of parameters present in response query string
      * @return PaymentsResponse
      */
-    PaymentsResponse handleRedirectPayload(String payload);
+    PaymentsResponse handleRedirectPayload(HashMap<String,String> details);
 
     /**
      * Authorizes a payment using Adyen API
diff --git a/adyenv6core/src/com/adyen/v6/facades/DefaultAdyenCheckoutFacade.java b/adyenv6core/src/com/adyen/v6/facades/DefaultAdyenCheckoutFacade.java
index 877a467b4..e550a5c5e 100644
--- a/adyenv6core/src/com/adyen/v6/facades/DefaultAdyenCheckoutFacade.java
+++ b/adyenv6core/src/com/adyen/v6/facades/DefaultAdyenCheckoutFacade.java
@@ -24,6 +24,7 @@
 import java.security.SignatureException;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -110,8 +111,10 @@
 import static com.adyen.constants.HPPConstants.Fields.SHIP_BEFORE_DATE;
 import static com.adyen.constants.HPPConstants.Fields.SKIN_CODE;
 import static com.adyen.constants.HPPConstants.Response.SHOPPER_LOCALE;
+import static com.adyen.v6.constants.Adyenv6coreConstants.KLARNA;
 import static com.adyen.v6.constants.Adyenv6coreConstants.OPENINVOICE_METHODS_ALLOW_SOCIAL_SECURITY_NUMBER;
 import static com.adyen.v6.constants.Adyenv6coreConstants.OPENINVOICE_METHODS_API;
+import static com.adyen.v6.constants.Adyenv6coreConstants.PAYMENT_METHOD;
 import static com.adyen.v6.constants.Adyenv6coreConstants.PAYMENT_METHOD_BOLETO;
 import static com.adyen.v6.constants.Adyenv6coreConstants.PAYMENT_METHOD_CC;
 import static com.adyen.v6.constants.Adyenv6coreConstants.PAYMENT_METHOD_IDEAL;
@@ -172,6 +175,7 @@ public class DefaultAdyenCheckoutFacade implements AdyenCheckoutFacade {
     public static final String CHECKOUT_SHOPPER_HOST_TEST = "checkoutshopper-test.adyen.com";
     public static final String CHECKOUT_SHOPPER_HOST_LIVE = "checkoutshopper-live.adyen.com";
     public static final String MODEL_IDEAL_ISSUER_LIST = "iDealissuerList";
+    public static final String MODEL_ENVIRONMENT_MODE = "environmentMode";
 
     protected static final Set<String> HPP_RESPONSE_PARAMETERS = new HashSet<>(Arrays.asList(HPPConstants.Response.MERCHANT_REFERENCE,
                                                                                              HPPConstants.Response.SKIN_CODE,
@@ -219,10 +223,15 @@ public void validateHPPResponse(final HttpServletRequest request) throws Signatu
     }
 
     @Override
-    public String getOriginKey() {
-        BaseStoreModel baseStore = baseStoreService.getCurrentBaseStore();
+    public String getOriginKey(HttpServletRequest request) throws IOException, ApiException {
+        return getAdyenPaymentService().getOriginKey(getBaseURL(request));
+    }
 
-        return baseStore.getAdyenOriginKey();
+    public String getBaseURL(HttpServletRequest request) {
+        String currentRequestURL = request.getRequestURL().toString();
+        int requestUrlLength = currentRequestURL.length();
+        int requestUriLength = request.getRequestURI().length();
+        return currentRequestURL.substring(0, requestUrlLength - requestUriLength);
     }
 
     @Override
@@ -236,6 +245,15 @@ public String getCheckoutShopperHost() {
         return CHECKOUT_SHOPPER_HOST_LIVE;
     }
 
+
+    @Override
+    public String getEnvironmentMode() {
+        if (baseStoreService.getCurrentBaseStore().getAdyenTestMode()) {
+            return "test";
+        }
+        return "live";
+    }
+
     @Override
     public String getHppUrl() {
         return getAdyenPaymentService().getHppEndpoint() + "/details.shtml";
@@ -261,6 +279,10 @@ public CartModel restoreSessionCart() throws InvalidCartException {
 
         getCartService().setSessionCart(cartModel);
         getSessionService().removeAttribute(SESSION_LOCKED_CART);
+        getSessionService().removeAttribute(SESSION_PAYMENT_DATA);
+        getSessionService().removeAttribute(THREEDS2_FINGERPRINT_TOKEN);
+        getSessionService().removeAttribute(THREEDS2_CHALLENGE_TOKEN);
+        getSessionService().removeAttribute(PAYMENT_METHOD);
 
         return cartModel;
     }
@@ -379,9 +401,16 @@ private AddressModel createBillingAddress(PaymentDetailsWsDTO paymentDetails) {
     }
 
     @Override
-    public PaymentsResponse handleRedirectPayload(final String payload) {
+    public PaymentsResponse handleRedirectPayload(HashMap<String, String> details) {
         try {
-            PaymentsResponse response = getAdyenPaymentService().getPaymentDetailsFromPayload(payload);
+            PaymentsResponse response;
+            String paymentMethod = getSessionService().getAttribute(PAYMENT_METHOD);
+
+            if (paymentMethod != null && paymentMethod.equals(KLARNA)) {
+                response = getAdyenPaymentService().getPaymentDetailsFromPayload(details, getSessionService().getAttribute(SESSION_PAYMENT_DATA));
+            } else {
+                response = getAdyenPaymentService().getPaymentDetailsFromPayload(details);
+            }
             restoreSessionCart();
             CartData cartData = getCheckoutFacade().getCheckoutCart();
             if (! cartData.getCode().equals(response.getMerchantReference())) {
@@ -422,7 +451,10 @@ public OrderData authorisePayment(final HttpServletRequest request, final CartDa
             throw new AdyenNonAuthorizedPaymentException(paymentResult);
         }
 
-        PaymentsResponse paymentsResponse = getAdyenPaymentService().authorisePayment(cartData, new RequestInfo(request), customer);
+        RequestInfo requestInfo = new RequestInfo(request);
+        requestInfo.setShopperLocale(getShopperLocale());
+
+        PaymentsResponse paymentsResponse = getAdyenPaymentService().authorisePayment(cartData, requestInfo, customer);
         if (PaymentsResponse.ResultCodeEnum.AUTHORISED == paymentsResponse.getResultCode()) {
             return createAuthorizedOrder(paymentsResponse);
         }
@@ -437,10 +469,14 @@ public OrderData authorisePayment(final HttpServletRequest request, final CartDa
                 getSessionService().setAttribute(SESSION_MD, paymentsResponse.getRedirect().getData().get(MD));
                 getSessionService().setAttribute(SESSION_PAYMENT_DATA, paymentsResponse.getPaymentData());
             }
+            if (KLARNA.equals(adyenPaymentMethod)) {
+                getSessionService().setAttribute(PAYMENT_METHOD, KLARNA);
+                getSessionService().setAttribute(SESSION_PAYMENT_DATA, paymentsResponse.getPaymentData());
+            }
             lockSessionCart();
         }
         if (PaymentsResponse.ResultCodeEnum.IDENTIFYSHOPPER.equals(paymentsResponse.getResultCode())) {
-            if (PAYMENT_METHOD_CC.equals(adyenPaymentMethod)|| adyenPaymentMethod.indexOf(PAYMENT_METHOD_ONECLICK) == 0) {
+            if (PAYMENT_METHOD_CC.equals(adyenPaymentMethod) || adyenPaymentMethod.indexOf(PAYMENT_METHOD_ONECLICK) == 0) {
                 getSessionService().setAttribute(THREEDS2_FINGERPRINT_TOKEN, paymentsResponse.getAuthentication().get(THREEDS2_FINGERPRINT_TOKEN));
                 getSessionService().setAttribute(SESSION_PAYMENT_DATA, paymentsResponse.getPaymentData());
 
@@ -448,7 +484,7 @@ public OrderData authorisePayment(final HttpServletRequest request, final CartDa
             lockSessionCart();
         }
         if (PaymentsResponse.ResultCodeEnum.CHALLENGESHOPPER.equals(paymentsResponse.getResultCode())) {
-            if (PAYMENT_METHOD_CC.equals(adyenPaymentMethod)|| adyenPaymentMethod.indexOf(PAYMENT_METHOD_ONECLICK) == 0) {
+            if (PAYMENT_METHOD_CC.equals(adyenPaymentMethod) || adyenPaymentMethod.indexOf(PAYMENT_METHOD_ONECLICK) == 0) {
                 getSessionService().setAttribute(THREEDS2_CHALLENGE_TOKEN, paymentsResponse.getAuthentication().get(THREEDS2_CHALLENGE_TOKEN));
                 getSessionService().setAttribute(SESSION_PAYMENT_DATA, paymentsResponse.getPaymentData());
             }
@@ -503,7 +539,7 @@ public OrderData handle3DS2Response(final HttpServletRequest request) throws Exc
 
         String fingerprintResult = request.getParameter(FINGERPRINT_RESULT);
         String challengeResult = request.getParameter(CHALLENGE_RESULT);
-        String paymentData =getSessionService().getAttribute(SESSION_PAYMENT_DATA);
+        String paymentData = getSessionService().getAttribute(SESSION_PAYMENT_DATA);
 
         String type = "";
         String token = "";
@@ -690,9 +726,8 @@ public void initializeCheckoutData(Model model) {
 
             //Exclude cards, boleto, bcmc and bcmc_mobile_QR and iDeal
             alternativePaymentMethods = alternativePaymentMethods.stream()
-                                                                 .filter(paymentMethod -> ! paymentMethod.getType().isEmpty()
-                                                                         && !isHiddenPaymentMethod(paymentMethod))
-                                                            .collect(Collectors.toList());
+                                                                 .filter(paymentMethod -> ! paymentMethod.getType().isEmpty() && ! isHiddenPaymentMethod(paymentMethod))
+                                                                 .collect(Collectors.toList());
         } catch (ApiException | IOException e) {
             LOGGER.error(ExceptionUtils.getStackTrace(e));
         }
@@ -725,9 +760,9 @@ public void initializeCheckoutData(Model model) {
 
         model.addAttribute(MODEL_REMEMBER_DETAILS, showRememberTheseDetails);
         model.addAttribute(MODEL_STORED_CARDS, storedCards);
-        model.addAttribute(MODEL_ORIGIN_KEY, getOriginKey());
         model.addAttribute(MODEL_DF_URL, adyenPaymentService.getDeviceFingerprintUrl());
         model.addAttribute(MODEL_CHECKOUT_SHOPPER_HOST, getCheckoutShopperHost());
+        model.addAttribute(MODEL_ENVIRONMENT_MODE, getEnvironmentMode());
         model.addAttribute(SHOPPER_LOCALE, getShopperLocale());
 
         Set<String> recurringDetailReferences = new HashSet<>();
diff --git a/adyenv6core/src/com/adyen/v6/factory/AdyenRequestFactory.java b/adyenv6core/src/com/adyen/v6/factory/AdyenRequestFactory.java
index 19df5b01d..3c53d910d 100644
--- a/adyenv6core/src/com/adyen/v6/factory/AdyenRequestFactory.java
+++ b/adyenv6core/src/com/adyen/v6/factory/AdyenRequestFactory.java
@@ -270,10 +270,10 @@ private void updatePaymentRequest(final String merchantAccount, final CartData c
         String acceptHeader = requestInfo.getAcceptHeader();
         String shopperIP = requestInfo.getShopperIp();
         String origin = requestInfo.getOrigin();
+        String shopperLocale = requestInfo.getShopperLocale();
 
         paymentsRequest.setAmountData(amount, currency).reference(reference).merchantAccount(merchantAccount).addBrowserInfoData(userAgent, acceptHeader).
-                shopperIP(shopperIP).setCountryCode(getCountryCode(cartData));
-        paymentsRequest.setOrigin(origin);
+                shopperIP(shopperIP).origin(origin).shopperLocale(shopperLocale).setCountryCode(getCountryCode(cartData));
 
         // set shopper details from CustomerModel.
         if (customerModel != null) {
@@ -451,6 +451,7 @@ private Address setAddressData(AddressData addressData) {
         }
 
         if (addressData.getRegion() != null && ! addressData.getRegion().getIsocode().isEmpty()) {
+            //State value will be updated later for boleto in boleto specific method.
             address.setStateOrProvince(addressData.getRegion().getIsocode());
         }
 
@@ -745,6 +746,21 @@ private void setBoletoData(PaymentsRequest paymentsRequest, CartData cartData) {
         shopperName.setFirstName(cartData.getAdyenFirstName());
         shopperName.setLastName(cartData.getAdyenLastName());
         paymentsRequest.setShopperName(shopperName);
+
+        if (paymentsRequest.getBillingAddress() != null) {
+            String stateOrProvinceBilling = paymentsRequest.getBillingAddress().getStateOrProvince();
+            if (! StringUtils.isEmpty(stateOrProvinceBilling) && stateOrProvinceBilling.length() > 2) {
+                String shortStateOrProvince = stateOrProvinceBilling.substring(stateOrProvinceBilling.length() - 2);
+                paymentsRequest.getBillingAddress().setStateOrProvince(shortStateOrProvince);
+            }
+        }
+        if (paymentsRequest.getDeliveryAddress() != null) {
+            String stateOrProvinceDelivery = paymentsRequest.getDeliveryAddress().getStateOrProvince();
+            if (! StringUtils.isEmpty(stateOrProvinceDelivery) && stateOrProvinceDelivery.length() > 2) {
+                String shortStateOrProvince = stateOrProvinceDelivery.substring(stateOrProvinceDelivery.length() - 2);
+                paymentsRequest.getDeliveryAddress().setStateOrProvince(shortStateOrProvince);
+            }
+        }
     }
 
     /**
diff --git a/adyenv6core/src/com/adyen/v6/model/RequestInfo.java b/adyenv6core/src/com/adyen/v6/model/RequestInfo.java
index 0820f30e6..6a29b6cac 100644
--- a/adyenv6core/src/com/adyen/v6/model/RequestInfo.java
+++ b/adyenv6core/src/com/adyen/v6/model/RequestInfo.java
@@ -31,6 +31,7 @@ public class RequestInfo {
     private String acceptHeader;
     private String shopperIp;
     private String origin;
+    private String shopperLocale;
 
     public RequestInfo(HttpServletRequest request) {
         this.userAgent = request.getHeader(USER_AGENT_HEADER);
@@ -70,4 +71,12 @@ public String getAcceptHeader() {
     public String getShopperIp() {
         return shopperIp;
     }
+
+    public String getShopperLocale() {
+        return shopperLocale;
+    }
+
+    public void setShopperLocale(String shopperLocale) {
+        this.shopperLocale = shopperLocale;
+    }
 }
diff --git a/adyenv6core/src/com/adyen/v6/service/AdyenPaymentService.java b/adyenv6core/src/com/adyen/v6/service/AdyenPaymentService.java
index 2857264cc..4e34d075b 100644
--- a/adyenv6core/src/com/adyen/v6/service/AdyenPaymentService.java
+++ b/adyenv6core/src/com/adyen/v6/service/AdyenPaymentService.java
@@ -24,6 +24,7 @@
 import java.math.BigDecimal;
 import java.security.SignatureException;
 import java.util.Currency;
+import java.util.HashMap;
 import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import com.adyen.httpclient.HTTPClientException;
@@ -89,10 +90,21 @@ public interface AdyenPaymentService {
      */
     boolean disableStoredCard(String customerId, String recurringReference) throws IOException, ApiException;
 
+    /**
+     * Retrieves payment response from /payments/details for redirect methods like klarna
+     */
+    PaymentsResponse getPaymentDetailsFromPayload( HashMap<String, String> details, String paymentData) throws Exception;
+
     /**
      * Retrieves payment response from /payments/details
      */
-    PaymentsResponse getPaymentDetailsFromPayload(String payload) throws Exception;
+    PaymentsResponse getPaymentDetailsFromPayload( HashMap<String, String> details) throws Exception;
+
+    /**
+     * Retrieves origin key from /originKeys endpoint
+     */
+
+    String getOriginKey(String originDomain) throws ApiException, IOException;
 
     /**
      * Returns the HPP base URL for the current basestore
diff --git a/adyenv6core/src/com/adyen/v6/service/DefaultAdyenPaymentService.java b/adyenv6core/src/com/adyen/v6/service/DefaultAdyenPaymentService.java
index 62efea919..a9c2eb5cb 100644
--- a/adyenv6core/src/com/adyen/v6/service/DefaultAdyenPaymentService.java
+++ b/adyenv6core/src/com/adyen/v6/service/DefaultAdyenPaymentService.java
@@ -26,6 +26,7 @@
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Currency;
 import java.util.Date;
@@ -50,6 +51,8 @@
 import com.adyen.model.checkout.PaymentsDetailsRequest;
 import com.adyen.model.checkout.PaymentsRequest;
 import com.adyen.model.checkout.PaymentsResponse;
+import com.adyen.model.checkoututility.OriginKeysRequest;
+import com.adyen.model.checkoututility.OriginKeysResponse;
 import com.adyen.model.modification.CancelOrRefundRequest;
 import com.adyen.model.modification.CaptureRequest;
 import com.adyen.model.modification.ModificationResult;
@@ -60,6 +63,7 @@
 import com.adyen.model.recurring.RecurringDetailsRequest;
 import com.adyen.model.recurring.RecurringDetailsResult;
 import com.adyen.service.Checkout;
+import com.adyen.service.CheckoutUtility;
 import com.adyen.service.Modification;
 import com.adyen.service.Payment;
 import com.adyen.service.exception.ApiException;
@@ -301,12 +305,11 @@ public boolean disableStoredCard(final String customerId, final String recurring
     }
 
     @Override
-    public PaymentsResponse getPaymentDetailsFromPayload(final String payload) throws Exception {
+    public PaymentsResponse getPaymentDetailsFromPayload(HashMap<String, String> details) throws Exception {
         Checkout checkout = new Checkout(client);
 
         PaymentsDetailsRequest paymentsDetailsRequest = new PaymentsDetailsRequest();
-        paymentsDetailsRequest.setDetails(new HashMap<>());
-        paymentsDetailsRequest.getDetails().put("payload", payload);
+        paymentsDetailsRequest.setDetails(details);
 
         LOG.debug(paymentsDetailsRequest);
         PaymentsResponse paymentsResponse = checkout.paymentsDetails(paymentsDetailsRequest);
@@ -315,6 +318,37 @@ public PaymentsResponse getPaymentDetailsFromPayload(final String payload) throw
         return paymentsResponse;
     }
 
+    @Override
+    public PaymentsResponse getPaymentDetailsFromPayload(HashMap<String, String> details, String paymentData) throws Exception {
+        Checkout checkout = new Checkout(client);
+        PaymentsDetailsRequest paymentsDetailsRequest = new PaymentsDetailsRequest();
+        paymentsDetailsRequest.setDetails(details);
+        paymentsDetailsRequest.setPaymentData(paymentData);
+
+        LOG.debug(paymentsDetailsRequest);
+        PaymentsResponse paymentsResponse = checkout.paymentsDetails(paymentsDetailsRequest);
+        LOG.debug(paymentsResponse);
+
+        return paymentsResponse;
+    }
+
+    @Override
+    public String getOriginKey(String originDomain) throws ApiException, IOException {
+        CheckoutUtility checkoutUtility = new CheckoutUtility(client);
+        OriginKeysRequest originKeysRequest = new OriginKeysRequest();
+        String originkey = "";
+        ArrayList<String> originDomains = new ArrayList<>(Arrays.asList(originDomain));
+
+        originKeysRequest.setOriginDomains(originDomains);
+        LOG.debug(originKeysRequest);
+        OriginKeysResponse originKeysResponse = checkoutUtility.originKeys(originKeysRequest);
+
+        if (originKeysResponse != null && originKeysResponse.getOriginKeys() != null) {
+            originkey = originKeysResponse.getOriginKeys().get(originDomain);
+        }
+        return originkey;
+    }
+
     @Override
     public String getHppEndpoint() {
         return config.getHppEndpoint();
diff --git a/adyenv6fulfilmentprocess/resources/adyenv6fulfilmentprocess.build.number b/adyenv6fulfilmentprocess/resources/adyenv6fulfilmentprocess.build.number
index aac4b8c85..c40bf68c1 100644
--- a/adyenv6fulfilmentprocess/resources/adyenv6fulfilmentprocess.build.number
+++ b/adyenv6fulfilmentprocess/resources/adyenv6fulfilmentprocess.build.number
@@ -6,5 +6,5 @@ group.id=com.adyen.v6
 module.name=platform-module
 name=adyenv6fulfilmentprocess
 vendor=adyen
-version=5.0.0
-version.api=5.0.0
+version=6.0.0
+version.api=6.0.0
diff --git a/adyenv6notification/resources/adyenv6notification.build.number b/adyenv6notification/resources/adyenv6notification.build.number
index cc2f1f97a..96bce5cd0 100644
--- a/adyenv6notification/resources/adyenv6notification.build.number
+++ b/adyenv6notification/resources/adyenv6notification.build.number
@@ -5,5 +5,5 @@ description=adyenv6notification
 name=adyenv6notification
 releasedate=20170803 1323
 vendor=adyen
-version=5.0.0
-version.api=5.0.0
+version=6.0.0
+version.api=6.0.0
diff --git a/adyenv6ordermanagement/resources/adyenv6ordermanagement.build.number b/adyenv6ordermanagement/resources/adyenv6ordermanagement.build.number
index fc6aadc4c..2eb77edc9 100644
--- a/adyenv6ordermanagement/resources/adyenv6ordermanagement.build.number
+++ b/adyenv6ordermanagement/resources/adyenv6ordermanagement.build.number
@@ -7,5 +7,5 @@ module.name=platform-module
 name=adyenv6ordermanagement
 releasedate=20170509 1754
 vendor=adyen
-version=5.0.0
-version.api=5.0.0
+version=6.0.0
+version.api=6.0.0