diff --git a/FiraCode.glyphs b/FiraCode.glyphs
index b901f68..bc0a1a3 100644
--- a/FiraCode.glyphs
+++ b/FiraCode.glyphs
@@ -263,6 +263,15 @@ value = -644;
 {
 name = hheaLineGap;
 value = 0;
+},
+{
+name = "Axis Location";
+value = (
+{
+Axis = Weight;
+Location = 300;
+}
+);
 }
 );
 descender = -386;
@@ -329,6 +338,15 @@ value = -644;
 {
 name = hheaLineGap;
 value = 0;
+},
+{
+name = "Axis Location";
+value = (
+{
+Axis = Weight;
+Location = 700;
+}
+);
 }
 );
 descender = -442;
diff --git a/distr/variable_ttf/FiraCode-VF.ttf b/distr/variable_ttf/FiraCode-VF.ttf
index 478384c..59a3553 100644
Binary files a/distr/variable_ttf/FiraCode-VF.ttf and b/distr/variable_ttf/FiraCode-VF.ttf differ
diff --git a/googlefonts-qa/checks/FiraCode-Light.checks.md b/googlefonts-qa/checks/FiraCode-Light.checks.md
index a002adc..c12daeb 100644
--- a/googlefonts-qa/checks/FiraCode-Light.checks.md
+++ b/googlefonts-qa/checks/FiraCode-Light.checks.md
@@ -235,13 +235,6 @@ Fontbakery version: 0.7.0
 * 🔥 **FAIL** This is a variable font, but it is using a naming scheme typical of a static font.
 * 🔥 **FAIL** Please change the font filename to use one of the following valid suffixes for variable fonts: VF, Italic-VF, Roman-VF
 
-</details>
-<details>
-<summary>🔥 <b>FAIL:</b> Checking OS/2 usWeightClass.</summary>
-
-* [com.google.fonts/check/usweightclass](https://github.com/googlefonts/fontbakery/search?q=com.google.fonts/check/usweightclass)
-* 🔥 **FAIL** OS/2 usWeightClass expected value for 'Light' is 300 but this font has 400.
-
 </details>
 <details>
 <summary>🔥 <b>FAIL:</b> Copyright notices match canonical pattern in METADATA.pb</summary>
@@ -258,19 +251,14 @@ But instead we have got: 'Copyright 2012-2015 The Mozilla Foundation, Telefonica
 * 🔥 **FAIL** Name Table entry: Copyright notices should match a pattern similar to: 'Copyright 2017 The Familyname Project Authors (git url)'
 But instead we have got: 'Copyright 2012-2015 The Mozilla Foundation, Telefonica S.A., and Nikita Prokopov (https://github.com/tonsky/FiraCode)'
 
-</details>
-<details>
-<summary>🔥 <b>FAIL:</b> Checking OS/2 usWeightClass matches weight specified at METADATA.pb.</summary>
-
-* [com.google.fonts/check/metadata/os2_weightclass](https://github.com/googlefonts/fontbakery/search?q=com.google.fonts/check/metadata/os2_weightclass)
-* 🔥 **FAIL** OS/2 usWeightClass (400:"Regular") does not match weight specified at METADATA.pb (300:"Light").
-
 </details>
 <details>
 <summary>🔥 <b>FAIL:</b> Variable font weight coordinates must be multiples of 100.</summary>
 
 * [com.google.fonts/check/varfont_weight_instances](https://github.com/googlefonts/fontbakery/search?q=com.google.fonts/check/varfont_weight_instances)
-* 🔥 **FAIL** Found an variable font instance with 'wght'=450.0. This should instead be a multiple of 100.
+* 🔥 **FAIL** Found an variable font instance with 'wght'=391.66667. This should instead be a multiple of 100.
+* 🔥 **FAIL** Found an variable font instance with 'wght'=441.66667. This should instead be a multiple of 100.
+* 🔥 **FAIL** Found an variable font instance with 'wght'=508.33333. This should instead be a multiple of 100.
 
 </details>
 <details>
@@ -279,6 +267,13 @@ But instead we have got: 'Copyright 2012-2015 The Mozilla Foundation, Telefonica
 * [com.google.fonts/check/valid_glyphnames](https://github.com/googlefonts/fontbakery/search?q=com.google.fonts/check/valid_glyphnames)
 * 🔥 **FAIL** The following glyph names do not comply with naming conventions: ['numbersign_numbersign_numbersign.liga', 'numbersign_numbersign_numbersign_numbersign.liga', 'numbersign_underscore_parenleft.liga', 'backslash_backslash_backslash.rem', 'numbersign_numbersign_numbersign.liga.rem', 'numbersign_numbersign_numbersign_numbersign.liga.rem', 'semicolon_semicolon_semicolon.rem', 'quadrantUpperLeftAndLowerLeftAndLowerRight', 'quadrantUpperLeftAndUpperRightAndLowerLeft', 'quadrantUpperLeftAndUpperRightAndLowerRight', 'quadrantUpperRightAndLowerLeftAndLowerRight', 'whiteSquareWithUpperLeftQuadrant', 'whiteSquareWithLowerLeftQuadrant', 'whiteSquareWithLowerRightQuadrant', 'whiteSquareWithUpperRightQuadrant', 'asciitilde_asciitilde_greater.liga', 'ampersand_ampersand_ampersand.rem', 'asciitilde_asciitilde_asciitilde.rem'] A glyph name may be up to 31 characters in length, must be entirely comprised of characters from the following set: A-Z a-z 0-9 .(period) _(underscore). and must not start with a digit or period. There are a few exceptions such as the special character ".notdef". The glyph names "twocents", "a1", and "_" are all valid, while "2cents" and ".twocents" are not.
 
+</details>
+<details>
+<summary>🔥 <b>FAIL:</b> The variable font 'wght' (Weight) axis coordinate must be 400 on the 'Regular' instance.</summary>
+
+* [com.google.fonts/check/varfont/regular_wght_coord](https://github.com/googlefonts/fontbakery/search?q=com.google.fonts/check/varfont/regular_wght_coord)
+* 🔥 **FAIL** The 'wght' axis coordinate of the 'Regular' instance must be 400. Got a '391.66667' coordinate instead.
+
 </details>
 <details>
 <summary>⚠ <b>WARN:</b> Checking OS/2 achVendID.</summary>
@@ -443,7 +438,7 @@ But instead we have got: 'Copyright 2012-2015 The Mozilla Foundation, Telefonica
 
 |  | FiraCode-Light.ttf |
 |:--- | ---:|
-| Dehinted Size | 238.1kb |
+| Dehinted Size | 238.0kb |
 | Hinted Size | 236.1kb |
 | Increase | -1992 bytes |
 | Change   | -0.8 % |
@@ -493,7 +488,7 @@ The version string must ideally include a git commit hash and either a 'dev' or
 <summary>ℹ <b>INFO:</b> Font contains all required tables?</summary>
 
 * [com.google.fonts/check/required_tables](https://github.com/googlefonts/fontbakery/search?q=com.google.fonts/check/required_tables)
-* ℹ **INFO** This font contains the following optional tables [GSUB, loca, GPOS, DSIG, gasp, prep]
+* ℹ **INFO** This font contains the following optional tables [DSIG, prep, gasp, loca, GPOS, GSUB]
 * 🍞 **PASS** Font contains all required tables.
 
 </details>
@@ -510,6 +505,13 @@ The version string must ideally include a git commit hash and either a 'dev' or
 * [com.google.fonts/check/name/unwanted_chars](https://github.com/googlefonts/fontbakery/search?q=com.google.fonts/check/name/unwanted_chars)
 * 🍞 **PASS** No need to substitute copyright, registered and trademark symbols in name table entries of this font.
 
+</details>
+<details>
+<summary>🍞 <b>PASS:</b> Checking OS/2 usWeightClass.</summary>
+
+* [com.google.fonts/check/usweightclass](https://github.com/googlefonts/fontbakery/search?q=com.google.fonts/check/usweightclass)
+* 🍞 **PASS** OS/2 usWeightClass value looks good!
+
 </details>
 <details>
 <summary>🍞 <b>PASS:</b> Check copyright namerecords match license file.</summary>
@@ -678,6 +680,13 @@ The version string must ideally include a git commit hash and either a 'dev' or
 * [com.google.fonts/check/metadata/canonical_weight_value](https://github.com/googlefonts/fontbakery/search?q=com.google.fonts/check/metadata/canonical_weight_value)
 * 🍞 **PASS** Font weight has a canonical value.
 
+</details>
+<details>
+<summary>🍞 <b>PASS:</b> Checking OS/2 usWeightClass matches weight specified at METADATA.pb.</summary>
+
+* [com.google.fonts/check/metadata/os2_weightclass](https://github.com/googlefonts/fontbakery/search?q=com.google.fonts/check/metadata/os2_weightclass)
+* 🍞 **PASS** OS/2 usWeightClass matches weight specified at METADATA.pb
+
 </details>
 <details>
 <summary>🍞 <b>PASS:</b> METADATA.pb weight matches postScriptName.</summary>
@@ -1059,13 +1068,6 @@ The version string must ideally include a git commit hash and either a 'dev' or
 * [com.google.fonts/check/points_out_of_bounds](https://github.com/googlefonts/fontbakery/search?q=com.google.fonts/check/points_out_of_bounds)
 * 🍞 **PASS** All glyph paths have coordinates within bounds!
 
-</details>
-<details>
-<summary>🍞 <b>PASS:</b> The variable font 'wght' (Weight) axis coordinate must be 400 on the 'Regular' instance.</summary>
-
-* [com.google.fonts/check/varfont/regular_wght_coord](https://github.com/googlefonts/fontbakery/search?q=com.google.fonts/check/varfont/regular_wght_coord)
-* 🍞 **PASS** Regular:wght is 400.
-
 </details>
 <details>
 <summary>🍞 <b>PASS:</b> The variable font 'wght' (Weight) axis coordinate must be 700 on the 'Bold' instance.</summary>
@@ -1095,5 +1097,5 @@ The version string must ideally include a git commit hash and either a 'dev' or
 
 | 💔 ERROR | 🔥 FAIL | ⚠ WARN | 💤 SKIP | ℹ INFO | 🍞 PASS |
 |:-----:|:----:|:----:|:----:|:----:|:----:|
-| 0 | 8 | 6 | 19 | 7 | 110 |
-| 0% | 5% | 4% | 13% | 5% | 73% |
+| 0 | 7 | 6 | 19 | 7 | 111 |
+| 0% | 5% | 4% | 13% | 5% | 74% |
diff --git a/googlefonts-qa/notes/QA-notes.md b/googlefonts-qa/notes/QA-notes.md
index 1a8db66..5c54af4 100644
--- a/googlefonts-qa/notes/QA-notes.md
+++ b/googlefonts-qa/notes/QA-notes.md
@@ -14,6 +14,9 @@
 
 - [ ] explore to find why this would be happening ... 
   - Encode Sans gets an OS/2 usWeightClass of `100`, matching its default instance.
+  
+**Solution**
+- Custom Parameters of `Axis Location` needed to be set in source masters (https://github.com/googlei18n/fontmake/issues/540)
 
 ======================================================================================
 
diff --git a/variable_ttf/FiraCode-VF.ttf b/variable_ttf/FiraCode-VF.ttf
deleted file mode 100644
index 90d01e3..0000000
Binary files a/variable_ttf/FiraCode-VF.ttf and /dev/null differ